Update + use symlinks

I've updated to head of the master repo and symlinked the colors directory into the Git submodule. This works fine for Vundle and Unix platforms. Not sure if this will work with Pathogen and/or Windows.