removed accidental scala from prefab in api
fixed comments in config getting duplicated when new settings were added (damn line endings...)
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/main/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java
try again, jenkins