Removing youcompleteme and changing colour scheme
Changing tab stops to 2 and removed file undo
Merge branch 'master' into linux

Conflicts:
	.vimrc
Removing ycm for non mac environments
adding .gitconfig
added new bundles and updated gitconfig
Disabling : -> ; for searching purposes
Merge remote-tracking branch 'origin/master' into linux

Conflicts:
	.vimrc
Oops, restoring some options from the merge
Adding startify, removing relative number switch
Using solarized, added easy motion key as tab
bash aliases and vimrc tweaks
Added alt shortcuts, jump to line, etc
one-lined color detection/setting
adding tmux config
Various changes
Swapped 0 and ^
Pulling some changes from master
Commenting and reorganizing
Merge remote-tracking branch 'origin/linux' Closing shop

Conflicts:
	.gitconfig
	.vimrc