Merge pull request #16 from ZomgPonies/master

merge from master
Merge pull request #17 from ZomgPonies/master

Merge from master
Tweaks and Fixes and Major Map Changed

More Info will be posted directly, later.
Merge pull request #430 from Fox-McCloud/Balance-Fix-Tweak-Round2

Balance fix tweak round2