add gem for environment variables in rspec tests
Merge pull request #13 from awguild/staging

Staging
Merge pull request #16 from awguild/staging

Staging
remove all the trailing whitespace
add tests for conference model
add tests for conference item
Merge branch 'master' into tests
Merge pull request #17 from awguild/tests

Tests