Registering of tile entity to prevent error.
Updated .gitignore
Merge branch 'master' into 1.7.10-update

This is because 1.7.10-update updated the code to the latest version of
MinecraftForge. This is now the master for this reason.