Add more regex, fix up a few issues, reset collectionhash again with these changes.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev