Merge pull request #89 from SCPR/calfire_app

closes out a couple issues prior to promotion...