Fork Update 26JUL2014

Jesus its been a month+ since I've done this.

Anyway, updating my personal fork so I can resume work.