Merge pull request #2 from rrosenblum/master

Adding Devise and doing some other cleanup