Ignore assets in git

Conflicts:
	.gitignore
Change csv_import_templates file column back to template_file historically
Merge pull request #91 from NESCent/openshift_cleanup

Cleanup issues discovered during OpenShift deployment
Merge branch 'master' into postgres_support
Tweak database.yml file for generalized use

Fix typo on HOST

Conflicts:
	config/database.yml
Schema changes after create, migrate, seed

Postgres