Added YouCompleteMe bundle to vim
Restructure shell config
Merge branch 'master' of github.com:evilmarty/dotfiles

Conflicts:
	vimrc