Git shortcuts and tmux keys
Merge branch 'master' of https://github.com/ainscore/dotfiles

Conflicts:
	config/awesome/rc.lua