Update SettingUpAFederatedNode.rst
Update SettingUpBitcoind.rst to fix a typo

 to take effecnt >  to take effect
Update SettingUpBitcoind.rst with config file loco

Mention that counterpartyd.conf is saved in:
    %AppData%\Roaming\Counterparty\counterpartyd\counterpartyd.conf
Correct log location on Linux

Was: tail -f ~/.config/counterparty/counterparty.log
Is: tail -f ~/.config/counterpartyd/counterparty.log
Correct log location on Linux

Was: ~/.config/counterparty/counterparty.log
Is: ~/.config/counterpartyd/counterparty.log
Merge pull request #7 from rippler/patch-1

Correct log location on Linux
Merge pull request #5 from rippler/patch-1

Update SettingUpBitcoind.rst to fix a typo
Merge pull request #6 from rippler/patch-2

Update SettingUpBitcoind.rst with config file loco
Merge pull request #8 from rippler/patch-2

Correct log location on Linux
Merge branch 'master' into develop

Conflicts:
	docs/SettingUpAFederatedNode.rst