Merge pull request #129 from SCPR/calfire_app

Oh adds a heck of a lot of things that will probably cause deploy to break, but it's time to level up...
fixes merge conflict on index.html
adds caveat for 2013 data that is visible per supervisor
updates settings common