updates for 2.0
Merge pull request #2 from dbashford/2point0

updates for 2.0