Attempt to minimize data file
Merge master into gh-pages