Merge pull request #10 from mattmakesmaps/develop

Accepting matt's pull request for a merge of develop.
Merge pull request #11 from mattmakesmaps/develop

Merge of Develop
Merge pull request #17 from mattmakesmaps/develop

Began file field ValidationError handling.
decompress zip hotfix.
Merge pull request #18 from mattmakesmaps/master

Merge hotfix