Worktop mergetop
Added gitignore
Removed submodules that were none
Removed redundant vim/bundle from repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	vim/.netrwhist
	vim/bundle/sparkup
	vim/bundle/vim-easymotion
	vim/bundle/vim-fugitive
	vim/bundle/vim-rails
	vim/bundle/vim-tmux-navigator
	vim/bundle/vundle
	vimrc
	zshrc
Update in vundler interface