merge upstream
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
pages_controller_spec all working again
Merge pull request #19 from tihuan/fix/pages_controller_spec

Fix/pages controller spec
Database Cleaner Working
Merge pull request #20 from tihuan/chore/database_cleaner_config

Database Cleaner Working
Add user show page, concert show page
- User can add concert to attended concerts via ajax
- Song videos added via ajax
- fixed various bugs
- removed turbolinks - it was causing add song jquery not to fire
- these features need tests
Merge pull request #21 from Onaracs/feature/users_page_show_attended_concerts

Add user show page, concert show page
Add check for multiple artists in MusicBrainz search
- It's a hack now - we assume only one of the artists returned
  is actually popular, so we iterate through each musicbrainz artist id
  and return the first one that results in a valid response from a setlist.fm search
- Need a better solution
100% coverage. Some tests are failing.
Merge pull request #23 from tihuan/test/increase_coverage_for_all

100% coverage. Some tests are failing.
Merge pull request #22 from raderj89/chore/musicbrainz-multiple-artists

Add check for multiple artists in MusicBrainz search
tests for concert controller, user
Merge pull request #24 from Onaracs/task/testing_users_concerts_pages

tests for concert controller, user
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