Merge pull request #32 from Magenic/master

Merging into my local branch
Merge pull request #33 from Magenic/master

Merging changes into my main fork.
Merge pull request #34 from Magenic/master

Merging into local fork
Work on getting Issue #120 to at least show model state errors
Merge pull request #121 from jwendl/master

Merging in changes to help with issue #120