getting ember working on my computer
schema up to date
Merge branch 'master' of https://github.com/tyrbo/tunefish into ember
Merge branch 'master' of https://github.com/tyrbo/tunefish into ember
working on my machine hopefully will on others
added better errors and binding of caller
added better errors and binding of caller
change order of execution in controllers
merge conflict rez
fix token expiration stuff
updates identity to update token everytime identity is accessed
merge with upstream master
tests are all passing
Merge pull request #22 from Hilaryous/fix_token_bug

Fix token bug
modal figuring out stuff
Add YoutubeSubscription to the database

Get rid of tracked_subscriptions, now tracking is done with a boolean
column.
Delete user_controllers_spec.rb
Serve json from youtube subs controller
Update activities and users controller
Update User#add_tracked_subscriptions to use new schema