Add gpg.conf
vimrc changes
Merge branch 'master' of github.com:frankploss/dotfiles

Conflicts:
	.vimrc
change gpg keyserver
fix vim, Xorg and zsh key bindings
add heroku toolbelt path to environment
Add debian package requirements file
Merge branch 'master' of github.com:fqxp/dotfiles
Add YankRing vim plugin
Add hitch setup
Fix publish script
Some minor changes
Merge branch 'master' of github.com:fqxp/dotfiles

Conflicts:
	.profile.d/00-environment
	.vimrc
Fix hitch shell setup to check for existence of hitch
add rvm initialization
add scratch vim plugin
Merge branch 'master' of github.com:fqxp/dotfiles
add bundle dirs to ackrc
fix ack alias
fix ruby dev setup