2.0 config
Merge pull request #2 from dbashford/2point0

2.0 config