change order of execution in controllers
merge conflict rez
modal figuring out stuff
found modal-backdrop bug
fix modal not closing bug
Merge pull request #23 from allisonlarson/sub_modal

Sub modal
Updated production Dockerfile and specified the proper host information for production database.
Update User#parse_subscriptions to use new schema

Pulled external API logic out of the user model
Fix merge conflicts
Modified ember gitignore file to ignore production builds
Add specs for YoutubeSubscription
WIP calling YoutubeAPIWorker from sessions controller
Merge remote-tracking branch 'upstream/master' into youtube-subs