Add some remedia renames
Merge branch 'master' of https://github.com/whatyouhide/dotfiles

* 'master' of https://github.com/whatyouhide/dotfiles:
  Add ANDROID_HOME shell variable
  Ignore node_modules system-wide in git
  Add git alias for merging with no fast-forward
  Add the 'rank' git alias
Add MAMP PHP to the PATH shell variable