adding to intellij keymappings
adding ant
Merge branch 'master' of github.com:mdodsworth/dotfiles
adding gradle
reducing the memory given to intellij: seeing some long pauses
openssh should be installed with keychain support
have intellij run against java 1.7 (rather than 1.6)
ok...let's try with java 1.8
adding a couple of intellij templates
switching over a few keymappings to avoid conflict with ideaVim
adding .ideavimrc link for...idea vim
more keymapping moves to avoid conflicts with vi mode
adding .ideavimrc as its own file, rather than being a link to .vimrc
more mapping changes
more intellij keymapping changes to support vi-mode
Merge branch 'master' into mdodsworth-air

Conflicts:
	playbooks/files/intellij/idea.vmoptions
adding hbase
Merge branch 'master' into mdodsworth-air
fixing brew update script state reporting