remove unused controller action
move GPG key validation to model
convert all templates from etanni to erb
update selenium webdriver gem
fix two tests
add additional xpath query in autolinker to satisfy tests
Merge branch 'master' into grape-api

Conflicts:
	Gemfile.lock