Subreddit update from berrymotes_data.js
Updated subreddits in data.py
Merge branch 'sr_update' into android
Changed emotes.json format