Brewfile: Install `p7zip` (i.e. `7z` etc.)
Merge branch 'master' of github.com:mathiasbynens/dotfiles

* 'master' of github.com:mathiasbynens/dotfiles:
  Brewfile: Install `p7zip` (i.e. `7z` etc.)

Conflicts:
	Brewfile
remove lua in brewfile
add 'git f' and 'git dmr'