JAVA_HOMEをJDK1.8に修正.
Add heroku-toolbet settings and customize alias for grep.
Merge branch 'master' into mac

Conflicts:
	home/.bashrc