reverting to 2de82c0914f3a89986fcfe692aa29821da42f1b9
sorting conflicts in sample.py & views.py
unstaging all deleted files
removing lightbox & tabletools stuff
removing .svn files and s2s UI files
adding s2s 4.0 UI stuff
adding .gitignore
removing any unwanted files
updating urls with api calls
adding aaron's code for chemicalanalysis.py
Merge branch 'metpetdb-dev' of https://github.com/metpetdb/metpetdb-py into metpetdb-dev

merging local with corrupted remote repo