Minor changes. colorscheme molokai added alias
Merge branch 'master' of github.com:sajoku/dotfiles

Conflicts:
	.gitignore_global
	vim/bundle/vim-colors-solarized
	vimrc
	zshrc
Add overlength to adhere to the 120 chars