Some fixes for vim and solarized colour tweaks.
Merge branch 'master' into linux-support

Conflicts:
	bash/bash_profile.symlink
Fix mac and windows OS detection.