remove trailing whitespace
Merge indigo-devel into F_fix_install_issues

Conflicts:
	README.md