Add Nate's key
Add my key to authorized_keys as well
Merge branch 'master' into maint/master/add_nates_key

Conflicts:
	templates/ssh/authorized_keys
Merge pull request #26 from shakedown/maint/master/add_nates_key

Add Nate's key