Random stuff for GNOS prototyping, not working yet
Merge branch 'develop' into feature/brian_pancan_fixes

Conflicts:
	README.md
Already checked this in...
Merge remote-tracking branch 'origin/feature/brian_pancan_fixes' into feature/brian_pancan_fixes