more intellij keymappings
Merge branch 'master' of github.com:mdodsworth/dotfiles
more intellij keymapping changes
reverting memory settings for intellij
removing phantomjs (as it's currently not supported in yosemite)
fixing idea.vmoptions path for intellij 13
changing back the mem settings for the air