Merge branch 'master' of github.com:cpatulea/dotfiles

Conflicts:
	.ackrc
	.bashrc
	.gdbinit
	.gitconfig
	.vimrc
	bin/burp