Merged with remote (which had switched to Vundle for package management) and tweaked to work on Uriel