diff --git a/Brewfile b/Brewfile
index 11e9bd1..2cd56c4 100644
--- a/Brewfile
+++ b/Brewfile
@@ -94,3 +94,5 @@ brew "ncdu"
 brew "tldr"
 # add pandoc
 brew "pandoc"
+# add ShellCheck
+brew "shellcheck"
diff --git a/centos.sh b/centos.sh
index 8b29840..1d1a019 100644
--- a/centos.sh
+++ b/centos.sh
@@ -181,10 +181,10 @@ cargo install fselect
 
 # surfraw
 git clone --depth 1 https://gitlab.com/surfraw/Surfraw.git \
-    && cd Surfraw
-    && ./prebuild
-    && ./configure
-    && make && make install
+    && cd Surfraw \
+    && ./prebuild \
+    && ./configure \
+    && make && make install \
     && cd .. \
     && rm -rf Surfraw
 
@@ -211,3 +211,6 @@ curl https://raw.githubusercontent.com/raylee/tldr/master/tldr > /usr/local/bin/
 
 # Add pandoc
 yum -y install pandoc
+
+# Add shellcheck
+yum -y install ShellCheck
diff --git a/dot_scripts/bootstrap.sh b/dot_scripts/bootstrap.sh
index 9dbdb7a..b5da7e1 100755
--- a/dot_scripts/bootstrap.sh
+++ b/dot_scripts/bootstrap.sh
@@ -104,6 +104,11 @@ git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/p
 ln -snf ~/Code/dotfiles/dot_zshrc ~/.zshrc
 ln -snf ~/Code/dotfiles/dot_zshrc.pre-oh-my-zsh ~/.zshrc.pre-oh-my-zsh
 
+git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+vim +PluginInstall +qall
+git clone https://github.com/dbeniamine/cheat.sh-vim.git ~/.vim/cheat.sh-vim
+
+
 # Install no-more-secrets
 git clone https://github.com/bartobri/no-more-secrets.git ~/Code/no-more-secrets
 cd ~/Code/no-more-secrets
diff --git a/dot_scripts/upgrade.sh b/dot_scripts/upgrade.sh
index 37460ef..bae2cf5 100755
--- a/dot_scripts/upgrade.sh
+++ b/dot_scripts/upgrade.sh
@@ -11,6 +11,8 @@ bundle update --all
 #gem update asciidoctor-pdf t
 zsh ~/.oh-my-zsh/tools/upgrade.sh
 npm update -g jira-node-cli --save
-sudo pip install --upgrade pip
-sudo pip3 install --upgrade pip
-
+sudo pip install --upgrade pip 2>/dev/null
+sudo pip3 install --upgrade pip 2>/dev/null
+pip freeze > ~/requirements.txt
+# Update VIM plugins installed via Vundle https://github.com/VundleVim/Vundle.vim
+vim +PluginUpdate +qall
diff --git a/dot_vimrc b/dot_vimrc
index 0445cca..58aa7c1 100644
--- a/dot_vimrc
+++ b/dot_vimrc
@@ -1,3 +1,47 @@
+set nocompatible              " be iMproved, required
+filetype off                  " required
+
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+" alternatively, pass a path where Vundle should install plugins
+"call vundle#begin('~/some/path/here')
+
+" let Vundle manage Vundle, required
+Plugin 'VundleVim/Vundle.vim'
+
+" The following are examples of different formats supported.
+" Keep Plugin commands between vundle#begin/end.
+" plugin on GitHub repo
+Plugin 'tpope/vim-fugitive'
+" plugin from http://vim-scripts.org/vim/scripts.html
+" Plugin 'L9'
+" Git plugin not hosted on GitHub
+Plugin 'git://git.wincent.com/command-t.git'
+" git repos on your local machine (i.e. when working on your own plugin)
+" Plugin "file:///$HOME/Code/"
+" The sparkup vim script is in a subdirectory of this repo called vim.
+" Pass the path to set the runtimepath properly.
+Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
+" Install L9 and avoid a Naming conflict if you've already installed a
+" different version somewhere else.
+" Plugin 'ascenator/L9', {'name': 'newL9'}
+
+" All of your Plugins must be added before the following line
+call vundle#end()            " required
+filetype plugin indent on    " required
+" To ignore plugin indent changes, instead use:
+"filetype plugin on
+"
+" Brief help
+" :PluginList       - lists configured plugins
+" :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
+" :PluginSearch foo - searches for foo; append `!` to refresh local cache
+" :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
+"
+" see :h vundle for more details or wiki for FAQ
+" Put your non-Plugin stuff after this line
+
 " Enable syntax highlighting
 syntax on
 " Enable line numbers
@@ -40,3 +84,27 @@ set scrolloff=3
 " Default colors for highlighting search result
 hi Search ctermfg=White
 hi Search ctermbg=DarkMagenta
+
+" test cheat.sh integration with VIM
+let mapleader=" "
+
+call vundle#begin()
+Bundle 'gmarik/vundle'
+Bundle 'scrooloose/syntastic'
+Bundle 'dbeniamine/cheat.sh-vim'
+Bundle 'tpope/vim-fugitive'
+call vundle#end()
+
+let g:syntastic_javascript_checkers = [ 'jshint' ]
+let g:syntastic_ocaml_checkers = ['merlin']
+let g:syntastic_python_checkers = ['pylint']
+let g:syntastic_shell_checkers = ['shellcheck']
+
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
diff --git a/dot_zsh_aliases b/dot_zsh_aliases
index 3d1206f..b102a81 100644
--- a/dot_zsh_aliases
+++ b/dot_zsh_aliases
@@ -11,14 +11,14 @@ alias npmlist='npm list -g --depth 0'
 
 # Jira
 alias jirasearch='issues'
-alias toollist="jira jql \"project = 'Internal Tooling'\""
-alias backlogs="jira jql \"status = New AND project IN (CICD, TOOL) AND Created > -2w ORDER BY Priority DESC\""
+alias cicdlist="jira jql \"project = 'CICD'\""
+alias backlogs="jira jql \"status = New AND project IN (CICD) AND Created > -2w ORDER BY Priority DESC\""
 alias bakclogs='backlogs'
-alias lastissues='jira jql "project IN (CICD, TOOL) AND Created > -2w ORDER BY Created DESC, Priority DESC"'
+alias lastissues='jira jql "project IN (CICD) AND Created > -2w ORDER BY Created DESC, Priority DESC"'
 alias workingon="jira jql \"assignee = currentUser() AND resolution = Unresolved AND status not in ('In Review', 'Done', 'In Testing', 'Waiting For Build') OR QA = currentUser() AND status = 'In Testing' ORDER BY updated DESC\""
-alias newissues="jira jql \"project IN (CICD, TOOL) AND Created > -2w AND resolution = Unresolved AND status not in ('In Progress') ORDER BY Created DESC, Priority DESC\""
+alias newissues="jira jql \"project IN (CICD) AND Created > -2w AND resolution = Unresolved AND status not in ('In Progress') ORDER BY Created DESC, Priority DESC\""
 alias n='newissues'
-alias backlog=toollist
+alias backlog=cicdlist
 alias bakclog='backlog'
 alias b='backlog'
 alias mybacklog="jira my-issues && asana"
diff --git a/dot_zsh_functions b/dot_zsh_functions
index 68242b5..f6378b9 100644
--- a/dot_zsh_functions
+++ b/dot_zsh_functions
@@ -16,8 +16,8 @@ function gmail() {
 function gmail2() {
     open -na "Google Chrome" --args "https://mail.google.com/mail/u/1"
 }
-function tooling() {
-    open -na "Google Chrome" --args "https://issues.collibra.com/secure/RapidBoard.jspa?rapidView=449&projectKey=TOOL&view=planning.nodetail"
+function cicd() {
+    open -na "Google Chrome" --args "https://issues.collibra.com/secure/RapidBoard.jspa?rapidView=457&view=planning.nodetail"
 }
 function issues() {
     jira jql "status = Open AND text ~ \"$*\" ORDER BY Created DESC"
@@ -122,5 +122,9 @@ function meteo() {
 }
 function how_in() {
   where="$1"; shift
-  IFS=+ curl "https://cht.sh/$where/$*"
+  IFS=+ curl "cht.sh/${where}/$*"
 }
+function rate() {
+    curl "http://rate.sx/$*"
+}
+
diff --git a/requirements.txt b/requirements.txt
index bc5d8f1..c5c2c98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 appdirs==1.4.3
 appnope==0.1.0
 argcomplete==1.10.0
+astroid==2.2.5
 awscli==1.16.140
 backcall==0.1.0
 beautifulsoup4==4.8.0
@@ -16,19 +17,22 @@ cycler==0.10.0
 ddgr==1.6
 decorator==4.4.0
 docutils==0.14
-gpg==1.13.0
+gpg==1.13.1
 gpiozero==1.5.1
 guizero==0.6.4
 idna==2.8
 ipykernel==5.1.1
 ipython==7.6.0
 ipython-genutils==0.2.0
+isort==4.3.21
 jedi==0.14.0
 jmespath==0.9.4
 jupyter-client==5.2.4
 jupyter-core==4.5.0
 kiwisolver==1.1.0
+lazy-object-proxy==1.4.1
 matplotlib==2.2.2
+mccabe==0.6.1
 multi-key-dict==2.0.3
 nudatus==0.0.3
 numpy==1.16.4
@@ -47,6 +51,7 @@ pycodestyle==2.4.0
 pyflakes==2.0.0
 pygame==1.9.6
 Pygments==2.4.2
+pylint==2.3.1
 pyparsing==2.4.0
 PyQt5==5.11.3
 PyQt5-sip==4.19.17
@@ -72,6 +77,7 @@ soupsieve==1.9.2
 tornado==6.0.3
 tqdm==4.32.1
 traitlets==4.3.2
+typed-ast==1.4.0
 urllib3==1.24.1
 urwid==2.0.1
 virtualenv==16.6.1
@@ -79,3 +85,4 @@ virtualenv-clone==0.5.3
 wcwidth==0.1.7
 webencodings==0.5.1
 websocket-client==0.54.0
+wrapt==1.11.2