Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Re-enabled tablets in dev branch (merging patches disabled it, gah).
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10