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