Last minute fixes
Merge branch 'google' of https://github.com/cyberzac/bitcointalk into google