continued work on cleaning up formsets
finishing touches on formsets
Merge branch 'master' of github.com:ITNG/labsite