Commit for merging

Minor editing.
Added Exception Types
tried to update scheme_setup.sql
.gitignore update