1.6.4 update to master.

Project is spitting and has different branches for different Minecraft and Forge builds moving forward to best maintain compatibility with the different API's.