mac用に設定を修正.
Modify for mac os x environment.
Merge branch 'master' into mac

Conflicts:
	home/.bashrc
Merge branch 'mac'