Remove android alias.
Ensure m and cap commands are run by bundler.
Adjust git out alias to use the deployed revision.
Adjust shortcuts and configuration for new version of macvim.