Merge branch 'develop' of github.com:ethereum/web3.js into develop

Author: frozeman

lib/web3/contract.js

@@ -210,7 +210,7 @@ var ContractFactory = function (eth, abi) {
 
         if (callback) {
 
-            // wait for the contract address adn check if the code was deployed
+            // wait for the contract address and check if the code was deployed
             this.eth.sendTransaction(options, function (err, hash) {
                 if (err) {
                     callback(err);