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
VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.
VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.
fixed bug that disabled tabs when navigating from the home page map while not logged in
fix links to use context appropriate title instead of 'research area' and 'organization'
Merge branch 'develop' of github.com:vivo-project/VIVO into develop
Merge branch 'develop' into feature/concept2departments