prepare merge upstream
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
fix up tests - all passing but sessions anomaly
Merge pull request #25 from raderj89/master

fix up tests - all passing but sessions anomaly
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
fix up model spec concert_song_spec
Merge pull request #26 from raderj89/master

fix up model spec concert_song_spec
take out line checking if musicbrainz result is string
Merge pull request #27 from raderj89/master

take out line checking if musicbrainz result is string
model/concert_song_spec all 7 exmaples all passed
fix merge conflict
Merge pull request #28 from tihuan/fix/model/concert_song_spec

Fix/model/concert song spec
fix conflict in factories
Merge branch 'Onaracs-master'