bump to devise 3
start upgrade to devise 3
Merge branch 'devise' of https://github.com/concerto/concerto into devise

* 'devise' of https://github.com/concerto/concerto:
  bump to devise 3

Conflicts:
	Gemfile
add parameter sannitizer to registration controller
Merge branch 'master' into devise

* master:
  Revert "Try to bundle without deployment to fix travis?"
  Try to bundle without deployment to fix travis?
Sanitize user params to allow for user sign-up
fix typo
update the ConcertoDevise Sessions Controller to close #583 and close #590
Merge pull request #591 from concerto/devise

Devise