differentiate linux/mac for java setting.
Merge branch 'master' of github.com:xianxu/bash-settings

Conflicts:
	.mybashrc
easier v and vv