upstream
Merge branch 'master' of github.com:UCSD-TIES/backgrid
Updating to 2.0