capistrano stuff
Merge branch 'master' of https://github.com/joelteon/kevin

Conflicts:
	damn.cabal