Fixing broken git repo
Added a few vim things
Merge branch 'master' of github.com:joshuaspence/dotfiles

Conflicts:
	home/config/sublime-text-2/Packages/.gitignore
	home/config/sublime-text-2/Packages/User/MarkdownPreview.sublime-settings
	home/config/sublime-text-2/Packages/User/Preferences.sublime-settings
	home/vim/after/plugin/bundle/NERDtree.vim
	home/vim/after/plugin/bundle/ack.vim
	home/vim/after/plugin/bundle/vundle.vim
	home/vim/after/plugin/keymap/nohlsearch.vim
	home/vim/after/plugin/keymap/spell-check.vim
	home/vim/after/plugin/keymap/vimrc.vim
	home/vim/plugin/bundles.vim
	home/vim/plugin/clipboard.vim
	home/vim/plugin/editing/backspace.vim
	home/vim/plugin/editing/bracket-matching.vim
	home/vim/plugin/editing/completion.vim
	home/vim/plugin/editing/formatoptions.vim
	home/vim/plugin/editing/undo.vim
	home/vim/plugin/files/autoread.vim
	home/vim/plugin/files/modeline.vim
	home/vim/plugin/folding.vim
	home/vim/plugin/keymap/mapleader.vim
	home/vim/plugin/keymap/maplocalleader.vim
	home/vim/plugin/pastetoggle.vim
	home/vim/plugin/search.vim
	home/vim/plugin/syntax.vim
	home/vim/plugin/tabs.vim
	home/vim/plugin/viewoptions.vim
	home/vim/plugin/visual/cmd.vim
	home/vim/plugin/visual/list.vim
	home/vim/plugin/visual/ruler.vim
	home/vim/plugin/visual/shortmess.vim
	home/vim/plugin/visual/wrap.vim