more fixes for popupt and marketing and such.
Merge branch 'master' of github.com:deanhiller/timecardz