Merge pull request #4 from danakj/master

Overhaul.
v2.1 upgrade.
Removed version number from readme. too lazy.
Move Settings startup code into the Settings class