Implement devise authentication
reconcile master and add_devise branches conflicts
Merge pull request #2 from djpowers/add_devise

Implement devise authentication