Version bumps and dependency fixes
Merge remote-tracking branch 'shiznix/master'