Added vim as a cross-platform editor in .gitconfig.
Manually sourced the nvm.sh file from .bashrc so it could be
cross-platform.
Merge branch 'master' into remote-server