purple-martins-2013/live-together — pull request #10 by SmilinColleen (2013-09-06 08:15:33+00:00)
Title: Chore controller

merged with current master on my branch. all tests pass. feature tests will be on a separate branch.