Updates to master

There aren't any significant changes here, just a small bugfix and rebalance, but just in case Meph grabs your repo for the next official release, I want to make sure those changes are in. :)

Keep being awesome.

~ pjf