Run linkapps step after installing packages
Install Java 7
Install MongoDB for deployed development
More vim plugins and some config tweaks
Link brew apps
Merge commit '22c920154e28b582002d86cd49278cee34d1ef60'

Conflicts:
	bin/brew-install