Merge pull request #28 from hmhaley/test_controllers

Test controllers
controllers, models, capybara path tested. 30 examples, 0 failures.