Set tabstop and shiftwidth to 4
added vim-git-gutter
Multiple terminal sessions append to history
Fixed path statement to be a little more readable.
Added android tools
Merge branch 'master' into oakland-university-dotfiles

Conflicts:
	zshrc
comment expandtabs for iOS app
Added autocmd vimenter * %retab! to retab files when opened.
Changed executable files to be green
Commented line out that shows tabs
ls everytime we cd
Added Markdown plugin
Disabled code folding markdown plugin
Removed show tab characters when file is opened
Fixed some of the formatting
Added keybindings to open and reload vimrc
set alias for diffs using gui diff tool
Added araxis merge to path
Added support for latex
Added stuff for jslint
Switched latex plugins