Commit WIP changes
Push several updates to dev
Merge pull request #1 from johnhorstman/dev

Push dev to master