Remove old version of songbird info
Merge remote-tracking branch 'kylelady/master'

Merge upstream root
Merge remote-tracking branch 'bradjc/add_places' into happy_hours
Add happy hour info through about the G's
Merge pull request #9 from ppannuto/happy_hours

Happy hours