Merge branch 'master' into add_vyper_linting

contracts/Vault.vy

@@ -55,6 +55,7 @@ interface DetailedERC20:
         view
 
 
+
 interface Strategy:
     def distributeRewards(_shares: uint256): nonpayable
     def estimatedTotalAssets() -> uint256: view
@@ -207,9 +208,9 @@ def apiVersion() -> String[28]:
 @external
 def setName(_name: String[42]):
     """
-    @notice 
+    @notice
         Used to change the value of `name`.
-        
+
         This may only be called by governance.
     @param _name The new name to use.
     """
@@ -220,9 +221,9 @@ def setName(_name: String[42]):
 @external
 def setSymbol(_symbol: String[20]):
     """
-    @notice 
+    @notice
         Used to change the value of `symbol`.
-        
+
         This may only be called by governance.
     @param _symbol The new symbol to use.
     """
@@ -449,6 +450,7 @@ def transferFrom(_from: address, _to: address, _value: uint256) -> bool:
     # Unlimited approval (saves an SSTORE)
     if (self.allowance[_from][msg.sender] < MAX_UINT256):
         self.allowance[_from][msg.sender] -= _value
+    self._transfer(_from, _to, _value)
     return True