Merge pull request #91 from geeksoflondon/90_fixdietschema

Migration to fix diet
Removing timer
Added some more interaction helpers
Merge pull request #96 from geeksoflondon/interactable_counts

Added some more interaction helpers
Merge branch 'master' into barcampberk