Include some noddy post-symlink setup for vundle/vim/colours.
Fix gitconfig push setting.
Fix powerline by adding scripts directory to path.
Merge branch 'deploy'