Merge branch 'master' into feature/scaffold

Makefile

@@ -15,11 +15,21 @@ test: lint
 test_server:
 	@TEST_SERVER_MODE=true nosetests -sv --with-coverage --cover-html ./tests/
 
-publish:
+aws_managed_policies:
+	scripts/update_managed_policies.py
+
+upload_pypi_artifact:
 	python setup.py sdist bdist_wheel upload
+
+build_dockerhub_image:
+	docker build -t motoserver/moto .
+
+tag_github_release:
 	git tag `python setup.py --version`
 	git push origin `python setup.py --version`
 
+publish: upload_pypi_artifact build_dockerhub_image tag_github_release
+
 scaffold:
 	@pip install -r requirements-dev.txt > /dev/null
 	@python scripts/scaffold.py