fixes gh-109: resolve conflict between Ownable and ERC20 token.

contracts/Ownable.sol

@@ -14,12 +14,12 @@ contract Ownable {
     owner = msg.sender;
   }
 
-  modifier onlyOwner() { 
+  modifier onlyOwner() {
     if (msg.sender == owner)
       _;
   }
 
-  function transfer(address newOwner) onlyOwner {
+  function transferOwnership(address newOwner) onlyOwner {
     if (newOwner != address(0)) owner = newOwner;
   }
 

test/Ownable.js

@@ -12,7 +12,7 @@ contract('Ownable', function(accounts) {
 
   it("changes owner after transfer", async function() {
     let other = accounts[1];
-    let transfer = await ownable.transfer(other);
+    let transfer = await ownable.transferOwnership(other);
     let owner = await ownable.owner();
 
     assert.isTrue(owner === other);
@@ -20,7 +20,7 @@ contract('Ownable', function(accounts) {
 
   it("should prevent non-owners from transfering", async function() {
     let other = accounts[2];
-    let transfer = await ownable.transfer(other, {from: accounts[2]});
+    let transfer = await ownable.transferOwnership(other, {from: accounts[2]});
     let owner = await ownable.owner();
 
      assert.isFalse(owner === other);
@@ -29,9 +29,9 @@ contract('Ownable', function(accounts) {
   it("should guard ownership against stuck state", async function() {
     let ownable = Ownable.deployed();
     let originalOwner = await ownable.owner();
-    let transfer = await ownable.transfer(null, {from: originalOwner});
+    let transfer = await ownable.transferOwnership(null, {from: originalOwner});
     let newOwner = await ownable.owner();
-    
+
     assert.equal(originalOwner, newOwner);
   });