Make room for Japanese charachers
Merge branch 'master' of https://github.com/huzai86/dotfiles
Merge branch 'master' of https://github.com/huzai86/dotfiles

Conflicts:
	.my_prompt
Added rsync excludes file