Merge branch 'andy' into development
continue removing simple form
Merge branch 'andy' of github.com:JohnJohnsonDampBox/schwagTracker into andy

bootstrap stuff
pulled andys bootstrap changes