Further tidying up of datasets to suit db structure
Merge branch 'master' of github.com:chriswait91/smartHack