--Caches
Merge branch 'master' of github.com:edmundhighcock/simpledataio

--Merge

Conflicts:
	autom4te.cache/requests
Merge branch 'master' of github.com:edmundhighcock/simpledataio
--cache
Merge branch 'master' of github.com:edmundhighcock/simpledataio
--merge

Conflicts:
	autom4te.cache/requests
--Now works with lahey