updating
Merge pull request #16 from dancingshell/Brandon

Added current_artists get_events
Merge branch 'Kyle'
cause rails!
cause github makes me do this 5 times and im going to give them a piece of my mind in SF
Fixed Gemfile.lock
Merge branch 'master' into Brandon
Fixing merge conflicts
Restored original dump file for Redis