Add heroku binaries to PATH
Add vim syntax highlighting for slim
Merge remote branch 'origin/master' into uw

Conflicts:
	bashrc
Add tab setting for Java source file
Merge branch 'master' into uw
Change gem path after upgrading to Ruby 2
Merge branch 'master' into uw

Conflicts:
	bashrc