Merge pull request #24 from smspezzano/upstream_master

Upstream master
fixed small syntax error
fixd merge conflicts
Merge pull request #25 from smspezzano/last_branch

fixd merge conflicts
vendor compiled assets
took out sidekiq stuff
updated gem file to reflect removed gems
updated sycn calls
Merge pull request #26 from smspezzano/heroku

Heroku
added comments to localhost users
Merge branch 'master' of github.com:smspezzano/d2jive
changed order of jsonp
added process false to api calls
WIP styling
WIP: songkick requests failing
WIP: songkick requests failing
WIP: songkick requests failing
WIP: songkick requests failing
WIP: songkick requests failing
WIP: heroku testing