some new stuff and cool things
Merge branch 'master' of https://github.com/GavinOvsak/DataFish