Merge branch 'master' of github.com:garaemon/garaemon-settings
update tmux.conf to load local powerline.conf
Set git's user.email and user.name