updated master to v0.6.4.1
Merge pull request #12 from kittehcoin/v0.6.4.1

V0.6.4.1 - Manually merged, auto-conflicts resolved.