Merge pull request #1 from rwwarren/dev

Dev
Merge pull request #2 from rwwarren/dev

Dev
Merge pull request #3 from rwwarren/dev

some cleanup and editing. user config is done
phpunit testing
Merge pull request #4 from rwwarren/dev

Dev