Merge pull request #2 from codealchemy/working-branch

Updates to models and db
Merge pull request #3 from codealchemy/working-branch

Updates to db tables
Merge pull request #4 from codealchemy/working-branch

Updating tests
Merge pull request #5 from codealchemy/working-branch

Functional updates
Clean app
Updates