explicitly use dotenv-rails in test
Merge branch 'master' into factory-to-fixture
factory -> fixture: CatalogItems controller spec
factory -> fixture: CheckinsController spec ignoring :today for now
factory -> fixture: remove user feature spec until I can do it right.
factory -> fixture: OrganizationsController spec has better attributes for new orgs
factory -> fixture: UsersController spec
factory -> fixture: user fixtures have correct password crypto; new location fixture
factory -> fixture: Checkins feature spec
factory -> fixture: ClientFlag feature spec is not currently useful.
factory -> fixture: unrestrained hacking
factory -> fixtures: heck just kill all the features
factory -> fixture: PointsEntryType controller
factory -> fixture: log out after tests