Undo flex report changes

from d717253c1e8681c7bb7319c5cd17f51a80edb71a
Remove unused models
Remove cruft
Merge branch 'master' into rails_4_0