Refactor for filecoin#22

cpacia wants to merge 3 commits intomasterOpenBazaar/wallet-interface:masterfrom

filecoinOpenBazaar/wallet-interface:filecoinCopy head branch name to clipboard