Merge pull request #1 from duncanita/master

Test
Test 2
first devise configuration
Rails update 3.2.11