Merge pull request #49 from ProPercivalalb/master

Gimme updates!
A bunch of fixes, start of Thaumcraft integration
Merge pull request #107 from chylex/master

A bunch of fixes, start of Thaumcraft integration