Merging dev into master so as not to be confusing when someone looks at this repo.  It's mostly a code sample at this point since the project is dead.