Merge pull request #165 from lyqyd/master

Fix Thaumcraft API submodule issue & intial CC 1.6 update
Merge pull request #168 from lyqyd/master

change submitted by gnif to update to cc 1.63
Merge pull request #169 from lyqyd/master

Internal yielding for sensor calls, magic sensor card, turtle fix.
a few small bug fixes
Merge pull request #174 from rtdog/master

a few small bug fixes
conflict resolution