Merge branch 'master' of https://github.com/spulec/moto into spulec-master

setup.py

@@ -8,10 +8,9 @@ import sys
 install_requires = [
     "Jinja2>=2.7.3",
     "boto>=2.36.0",
-    "boto3>=1.6.16",
+    "boto3>=1.6.16,<1.8",
     "botocore>=1.9.16,<1.11",
-    "cookies",
-    "cryptography>=2.0.0",
+    "cryptography>=2.3.0",
     "requests>=2.5",
     "xmltodict",
     "six>1.9",
@@ -41,7 +40,7 @@ else:
 
 setup(
     name='moto',
-    version='1.3.5',
+    version='1.3.6',
     description='A library that allows your python tests to easily'
                 ' mock out the boto library',
     author='Steve Pulec',