updates to remove debugging statements, etc.
updates to remove errant file and updates for adding concept
updates for preprocessor
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

Conflicts:
	.gitignore