add popularity method to concert model
fix merge conflicts
Merge branch 'master' of github.com:kevinhylant/farecast