using different data folder for testing
Merge branch 'master' into testing

Conflicts:
	leveldb-storage/leveldb-test.js
added redis-storage test
Merge pull request #252 from scrollback/testing

Testing