updating my email address
adding hipchat and splitting-out java dependent packages
switching over to community edition
switching to community edition
adding a little google style to the intellij settings
adding java7
switching to pull/push the current branch
adding tunnelblick
a few intellij keymapping changes
changing the font size for intellij
reducing the heap size for intellij
changing the default indent from 2 to 4 for java
switching to protobuf 2.5.0
adding versions tap
splitting out separate make targets
enable vi mode
adding karabiner package
enabling remap for left ctrl -> esc
for the 'all' target, request the sudo passwd immediately
Merge branch 'master' into mdodsworth-air

Conflicts:
	playbooks/files/intellij/idea.vmoptions