Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Make boot loader prefer screens with keyboards attached
make openos perfer screens with keyboards attached.
Ugly workaround for IC2+Racks, closes #404.
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
Merge branch 'patch-2' of https://github.com/istasi/OpenComputers
Merge branch 'patch-3' of https://github.com/istasi/OpenComputers
OCD!
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10