remaining change to tmpdir for current tests
Merge branch 'master' of https://github.com/dcwalk/inf1340_2014_asst1enr