General minor cleanup and organization.
Merge branch 'master' of github.com:StellaCannefax/pico-nova