Merge master w/ heroku and meetup auth updates