add vim ack plugin
Merge branch 'master' of github.com:mfussenegger/dotfiles
update gitignore
Merge branch 'master' of github.com:mfussenegger/dotfiles
remove PYTHONDONTWRITEBYTECODE

as it doesn't work with buildout
tweak pw() and greph() sh functions

pw(): copy to clipboard without newline
greph(): use history function
i3: remove duplicate keybindings; use XF86Audio* instead of keycode
vimrc: add puppet settings
Merge remote-tracking branch 'origin/master' into air

Conflicts:
	i3/config
	xinitrc