added option to disable local cache file
perform a proper oculus teardown if it isn't present
Merge pull request #1543 from birarda/master

perform a proper oculus teardown if it isn't present
Merge pull request #1537 from ZappoMan/stephens_requests

added option to disable local cache file
merge upstream with local repo