fixed aggregation/testSlave.js by waiting a moment for replication #648
disabled aggregation $geoNear test #648
fixed the way smoke.py adds an admin user #648

previously it would error if the user already existed
Merge branch 'bugfixes/tokumx-1.3' of github.com:Tokutek/mongo into bugfixes/tokumx-1.3
Merge branch 'bugfixes/tokumx-1.3' into releases/tokumx-1.3