Merge pull request #6 from wesleykendall/develop

added migrations to the setup file
Merge pull request #7 from ambitioninc/develop

Master release back into develop
updated version in setupd
fixed version conflict