Merge pull request #1 from jaywagnon/update_from_upstream

Update from upstream
Fix for git credentials containing an '=' sign

Thanks @dbussink
Merge pull request #628 from boxen/args-may-contain-equals

Fix for git credentials containing an '=' sign
Clean up alias section.
Add VirtualBox.  Comment for VMWare.
Fix fetch alias.
Add VirtualBox.
Do not add git aliases for now.
Merge branch 'master' of https://github.com/boxen/our-boxen into update_from_upstream