completed Key#import with tests
Merge branch 'master' of github.com:phoenix-scitent/okm

Conflicts:
	app/controllers/keys_controller.rb