Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Properly converting loot and os floppies to plain floppies when wiping them (shift-rightclick) so they stack.
Improved adapter behavior some, trying to differentiate compound driver environments to avoid re-using saved data where inappropriate. Should close #510.
Fixed potential magical NPE in Keyboard (seemed to only happen when unloading a world by leaving the game).
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/server/component/Keyboard.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala