Add Fred Lifton public key
Add eric sorensons key
Merge remote-tracking branch 'upstream/master' into add/master/add_my_ssh_pub

Conflicts:
	templates/ssh/authorized_keys