updating with changes made from spaghettimonster
Merge branch 'master' of https://github.com/charlesreid1/tony-gwynn
fixing some half-baked stuff