Merge pull request #13 from ZomgPonies/master

Merge from Master
Merge pull request #14 from ZomgPonies/master

Merge From Master
Merge pull request #15 from ZomgPonies/master

Merge from master
Fix, Tweak, and Revise

fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
Merge pull request #425 from Fox-McCloud/Balance-Fix-Tweak-Round1

Balance fix tweak round1