Merge branch 'master' of github.com:gunyarakun/dotfiles

c the commit.
Add path_helper for Mac
Add jsx
Merge branch 'master' of github.com:gunyarakun/dotfiles

Conflicts:
	bootstrap