set default_url_options back to heroku until gg.com propagates
added mandrill-api gem
clarified prereg email so it doesn't freak makers out
merge remote into local master