moved the SECRET back to the settings_local as this affects user logins
Merge commit '9a31419e487381563cb539d4712448bf0be5bea0'
Merge branch 'master' of https://github.com/OAButton/OAButton
* changed static load settings so that things work in dev properly
* moved non-SSL content onto local server
added a phantomjs script to download and evaluate pages to defeat obfuscated email addresses
refactored URL into python code for email extraction
capture stderr so that we don't spew to console
more refactoring of email address extractor
got rid of all template js
added tests for nature.com
added nose test runner.  this is probably a bad idea.
added note on dep for PhantomJS to read email addresses from URLs
added code and tests for email confirmation links to close off #130
dropped expiry on confirmation links
auto send confirmation email on bookmarklet signup
Merge pull request #218 from OAButton/features/148-better-email-extraction

Features/148 better email extraction
Merge pull request #220 from OAButton/features/210-confirm-email

Features/210 confirm email
added models to record blocked URLs so that we can notify authors to release an open version
send an author notification email that includes a link to publish an open access version of their article
added code and tests to verify that adding a blocked URL is saved into
the database