Added powerline
added foo to mac branch
stake
Added git branch to tmux statusline
stake
Merge branch 'foo' into mac
Added gitgutter
Merge branch 'mac'
Merge branch 'master' of github.com:codeprimate/arid

Conflicts:
	.vim/.netrwhist
removed bad files
stake