A lot of untracked changes - I haven't kept up.
Merge pull request #1 from softsprocket/adaythere.dev.gmartin

A lot of untracked changes - I haven't kept up.