Merege with mac mini in office
Add .gemrc. rename others starting with period
Update
Merge modifications from BMP at home

Conflicts:
	Memo/mac.md
	shell_and_terminal/.bash_profile
	shell_and_terminal/.git-completion.bash
Update sublime settings