Adding settings
Adding 2.0.1 support.
Fixing settings file.
Merging fix to master.
Fixing parent versions.
Merge branch '2.0-maint'