Merge pull request #7 from catburston/development

Basic functionality & model tests