merging in daniel's routes cleanup
Remove hanging spaces at end of lines and clean up formating
Improve organization index view code formatting.

Conflicts:
	app/views/organizations/index.html.erb
Merge branch 'develop' into cherrypicking_daniel
merging recent changes to routes file with daniels cleanup