Merge branch 'master' of git://github.com/zaiste/vimified

* 'master' of git://github.com/zaiste/vimified:
Use an existing colorscheme in vimrc

If the package "color" is enabled, then use the molokai.colortheme,
otherwise use default.colortheme as delivered with stock vim
distribution.
Merge pull request #69 from DirkR/master

Use an existing colorscheme in vimrc