Merge pull request #17 from aramonc/master

Schema & Import changes
Merge pull request #5 from Code-for-Miami/master

Merge pull request #17 from aramonc/master