Hardmode, gitgutter, screen-256color
Misc tweaks
Merge branch 'osx' of github.com:kevincolyar/dotfiles into osx

Conflicts:
	vimrc
Merge