Merge pull request #86 from 0nebit/master

All caching implemented, not tested.
minor test fixes
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk