Devise

This has been tested locally, merging master into devise branch. Please merge devise into master.