styled up forms
Allow for config mapping of akid to orig_akid to be passed to ActionKit
Merge branch 'master' of github.com:controlshift/prague-server

Conflicts:
	app/views/devise/confirmations/new.html.erb
	app/views/devise/passwords/edit.html.erb
	app/views/devise/passwords/new.html.erb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/unlocks/new.html.erb