Changed cache_dir to temp_dir, using the tempfile-module. Closes #5
Merge branch '1.1-dev' into master