bitcoin: ppa typo, terminal: rearange
Merge branch 'master' of github.com:wuxxin/salt-shared