Merge pull request #10 from GeoffPurdy/master

merged your recent changes and fixed user_id not found errors
devise situation resolved