includes fix, data sets controller pg clean ups
Merge branch 'master' of https://github.com/jcburke14/dugong