change waffle table to work with new user model
proper type for last_login column (bug 1006482)
fix for mysql 5.7
change some more sql around