Updated screen to use Ctrl+Space as the escape char, plus increasing the scrollback
Added gi alias for getting to git folder..
Changed the default colorscheme to molokai
Gitignoring swap files
Added .vim folder only ignore file
Added NERDTree and CtrlP modules for vim, changed the screen escape char from Ctrl+Space to Ctrl+X - yet another conflict
Added random facts and a print of all available colours
Added airline for vim
Commit order changed to topo for tig
Included aliases for vagrant and a json formatting function in vim
Added new aliases for merging/diff
Removed direct load of bash_completion and loading profile.d/* files direct
Newline for the prompt
Updated paths
Added date + time in the prompt
Added some more modules + vundle

Conflicts:
	.bash_profile
Updted the readme so I know wtf I do when I run the update.sh script in the wrong location again. Also included vundle as a git submodule.... no consistency here. Love it
Removed powerline... as i have airline
Changed the mustache highlighter
Removed commited bundles