Merge branch 'develop'

Author: caleb531

requirements.txt

@@ -7,7 +7,7 @@ mccabe==0.4.0
 nose==1.3.7
 pep8==1.7.0
 pyflakes==1.0.0
+pypandoc==1.2.0
 python-termstyle==0.1.10
 radon==1.2.2
 rednose==0.4.3
-wheel==0.24.0

setup.py

@@ -16,7 +16,7 @@ def get_long_description():
 
 setup(
     name='cache-simulator',
-    version='1.0.1',
+    version='1.0.1r1',
     description='A processor cache simulator for the MIPS ISA',
     long_description=get_long_description(),
     url='https://github.com/caleb531/cache-simulator',