Install basic plugin
Merge branch 'master' of https://github.com/konnyakmannan/dotfiles

Conflicts:
	.vim/bundle/.neobundle/doc/tags
	.vim/bundle/.neobundle/install_info
	.vimrc
Setting for vimshell and coding haskell.