removing intellij 13
adding some git aliases
adding a couple of git aliases
Merge branch 'master' into mdodsworth-air
increasing heap