Clean up of vimrc and fix indent settings

vim will now load the correct indent files

Also cleaned up some of the settings
Merge branch 'master' of github.com:shumphrey/Vim-Settings

* 'master' of github.com:shumphrey/Vim-Settings:
  Add some settings from tpope's sensible.vim

Conflicts:
	vimrc