amend docs with small requested changes

Author: gichiba

docs/_Docs_GetStarted.md

@@ -30,7 +30,7 @@ It is possible to use `npm` instead of `yarn`, but you'll need to adapt any inst
 
 In order to compile the colonyNetwork smart contracts, you will need to have Docker installed and running. We recommend using Docker Community Version `2.0.0.0`. You can find instructions for installing Docker here: [Docker Installation](https://docs.docker.com/install/).
 
-The colonyNetwork smart contracts require the `ethereum/solc:0.5.6` Docker image, so we will need to pull it down before we can begin.
+The colonyNetwork smart contracts require the `ethereum/solc:0.5.8` Docker image, so we will need to pull it down before we can begin.
 
 Make sure Docker is installed and then run the following command.
 
@@ -94,12 +94,14 @@ Rather than import the entire set of contracts into remix, use the included `sol
 $ yarn flatten:contracts
 ```
 
-Alternatively, you can put them into the directory of your choice, e.g. `~/Downloads/`:
-```
-$ yarn steamroller /contracts/IColonyNetwork.sol > ~/Downloads/flatIColonyNetwork.sol
-```
+Navigate to `colonyNetwork/build/flattened/` to find the contracts you need to import to Remix.
+
+In Remix, you'll need to instantiate `flatIColonyNetwork.sol` to the `ColonyNetwork` address `0x79073fc2117dD054FCEdaCad1E7018C9CbE3ec0B` in order to create a new colony.
+
+Use the address of your existing ERC20 token contract to `createColony()`, then immidiately use `getColonyCount()` to get your colony's ID.  
+
+Call `getColony()` to get your colony's address from the ID, then instantiate `flatIColony.sol` to your colony's address in Remix.
 
-Import the flattened contract into the remix IDE, and then call `createColony()`
 
 ### Access with the Truffle console
 
@@ -120,17 +122,17 @@ $ yarn truffle console --network goerli
 ```
 In the truffle console, instantiate the IColonyNetwork interface for `glider-rc.1`:
 ```
-truffle(goerli)> let IColonyNetwork = await IColonyNetwork.at("0x79073fc2117dD054FCEdaCad1E7018C9CbE3ec0B")
+truffle(goerli)> let colonyNetwork = await IColonyNetwork.at("0x79073fc2117dD054FCEdaCad1E7018C9CbE3ec0B")
 
 ```
 From here, you can create a new colony (with an ERC20 token already deployed):
 ```
-truffle(goerli)> IColonyNetwork.createColony("your-erc20-token-address")
+truffle(goerli)> await IColonyNetwork.createColony("your-erc20-token-address")
 ```
 And find your colony's id (the newest created colony) after the transaction is mined:
 ```
 
-truffle(goerli)> IColonyNetwork.getColonyCount()
+truffle(goerli)> await IColonyNetwork.getColonyCount()
 ```
 ### Local Development and Testing
 
@@ -139,13 +141,16 @@ You can start a local test node and deploy the contracts yourself using the loca
 ```
 yarn run start:blockchain:client
 
-./node_modules/.bin/truffle migrate --reset --compile-all
+yarn truffle migrate --reset --compile-all
 ```
 
-To deploy all contracts and run all tests, run the following command.
-
+To deploy all contracts and run all contract tests:
+```
+yarn test:contracts
+```
+To deploy all contracts and run all reputation mining tests:
 ```
-yarn run test:contracts
+yarn test:reputation
 ```
 
 For more detailed instructions, and additional steps required to set up an environment for use with [colonyJS](https://github.com/JoinColony/colonyJS), check out the colonyJS [Local Setup](/colonyjs/intro-local-setup/) documentation.

docs/_Docs_ReputationMining.md

@@ -4,7 +4,7 @@ section: Docs
 order: 6
 ---
 
-The reputation mining client is usable for testing but it has limited functionality. Still, it is possible to run a single miner instance for usable reputation scores on a local test network.
+## Local Network
 
 ### Start Mining Client
 

docs/_bug_rules.md

@@ -44,7 +44,7 @@ Once submitted, the issue will be responded to, verified, accepted, and rewarded
 ### Submission Branches
 Participants in the program are free to submit bugs on two different branches in the colonyNetwork codebase:
 * the current testnet release (tagged on the `develop` branch) and deployed to Görli
-* against the `master` branch where we merge ongoing work
+* against the `master` branch which will be tagged as the mainnet release for deployment
 
 ### Bug Severity and Bounties
 In the same manner as the [Ethereum Bug Bounty Program](https://bounty.ethereum.org/), submissions will be evaluated by the Colony team according to the [OWASP risk rating methodology](https://www.owasp.org/index.php/OWASP_Risk_Rating_Methodology), which grades based on both _Impact_ and _Likelihood_.

package.json

@@ -18,9 +18,8 @@
     "provision:token:contracts": "truffle compile && truffle compile --contracts_directory 'lib/dappsys/[!note][!stop][!proxy][!thing][!token]*.sol' && bash ./scripts/provision-token-contracts.sh",
     "start:blockchain:client": "bash ./scripts/start-blockchain-client.sh",
     "stop:blockchain:client": "bash ./scripts/stop-blockchain-client.sh",
-    "test:contracts": "npm run start:blockchain:client & truffle migrate --reset --compile-all && truffle test ./test/contracts-network/* --network development",
-    "test:reputation": "npm run start:blockchain:client & truffle migrate --reset --compile-all && nyc truffle test ./test/reputation-system/* --network development",
-    "flatten:contracts": "mkdir -p ./build/flattened/ && steamroller contracts/IColonyNetwork.sol > build/flattened/flatIColonyNetwork.sol && steamroller contracts/IColony.sol > build/flattened/flatIColony.sol",
+    "flatten:contracts": "mkdir -p ./build/flattened/ && steamroller contracts/IColonyNetwork.sol > build/flattened/flatIColonyNetwork.sol && steamroller contracts/IColony.sol > build/flattened/flatIColony.sol && steamroller contracts/IReputationMiningCycle.sol > build/flattened/flatIReputationMiningCycle.sol && steamroller contracts/IMetaColony.sol > build/flattened/flatIMetaColony.sol && steamroller contracts/IRecovery.sol > build/flattened/flatIRecovery.sol && steamroller contracts/IEtherRouter.sol > build/flattened/flatIEtherRouter.sol",
+    "test:contracts": "npm run start:blockchain:client & truffle migrate --reset --compile-all && truffle test --network development",
     "test:contracts:upgrade:parity": "npm run start:blockchain:client parity & npm run generate:test:contracts && truffle migrate --reset --compile-all && truffle test ./test-upgrade/* --network integration",
     "test:contracts:upgrade:ganache": "npm run start:blockchain:client & npm run generate:test:contracts && truffle migrate --reset --compile-all && truffle test ./test-upgrade/* --network development",
     "test:contracts:gasCosts": "npm run start:blockchain:client & truffle migrate --reset --compile-all && truffle test test-gas-costs/gasCosts.js --network development",