Add new key
Add stuff to my keyring
Merge branch 'master' of github.com:heliocentric/Misc

Conflicts:
	ssh_keyring
Get rid of ssh_keyring and replace it with .pub, and add a new key