Merge branch 'view-all-keys' of github.com:phoenix-scitent/okm into view-all-keys

Conflicts:
	app/views/keys/index.html.erb
	app/views/keys/index.json.jbuilder
Merge branch 'view-all-keys' of github.com:phoenix-scitent/okm into view-all-keys