Move SSH settings to config/
Merge branch 'master' into jesse
Change a bunch of crap
Update Gemfile.lock
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz

Conflicts:
	.gitignore