Merged changes that we had both made to INSTALL
Merge branch 'master' of github.com:howardpchen/capricorn
Merge branch 'master' of github.com:howardpchen/capricorn
Merge branch 'master' of github.com:howardpchen/capricorn
Fixed install merge issues and updated db struct
Merge pull request #13 from shadowdoc/update-install-to-match-dbstructure

Update install to match dbstructure