Cleanup
Merge branch 'master' of github.com:jakob-lundberg/Dot-Files

Conflicts:
	.ssh/authorized_keys