Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into robot_components

Conflicts:
	reference.conf