Merge branch 'release/0_2_0' into develop
Merge branch 'hotfix/missing_ignorelist_alembic_script' into develop
Merge branch 'hotfix/update_quickstart_documentation' into develop
Merge branch 'hotfix/documentation_fixes' into develop
Add localhost as valid origin for a CORS call
Initial implementation of redshift watcher and auditor
Merge pull request #70 from Yelp/localhost_cors

Add localhost as valid origin for a CORS call
Refactor so that new watchers/auditors are easier to add
Merge branch 'hotfix/configurable_api_server' into develop
Merge branch 'hotfix/connect_ses_exception_not_caught' into develop
Merge branch 'hotfix/upgrade_flask_security' into develop
watchers: add slurper for Elastic IP

Signed-off-by: Luca Bruno <luca.bruno@rocket-internet.de>
reporter: find changes for EIP

Signed-off-by: Luca Bruno <luca.bruno@rocket-internet.de>
manager: add command for EIP watcher

Signed-off-by: Luca Bruno <luca.bruno@rocket-internet.de>
Merge branch 'redshift' of https://github.com/Yelp/security_monkey into Yelp-redshift

Conflicts:
	manage.py
fixing reference to security_monkey.scheduler
Fixing imports and names
Adding default region for sts_connect on redshift
Removing unused code and pudb
Merge branch 'Yelp-redshift' into develop