Fixes #8
Item status now stored on the item
Underscoring for consistency
And switching back again
Merge pull request #9 from adaptlearning/issue/8

Fixes #8
Merge pull request #11 from adaptlearning/develop

Develop