cleaned up stuff except store pretty much
Merge pull request #86 from calblueprint/kevin/alotofstuff

cleaned up stuff except store pretty much