Merge pull request #3 from Brian-Boyd/master

Add bootstrap and changed migrate files.
updating forms
Merge pull request #4 from cjcoopersc/master

updating forms
added join migration and revised other migrations and models