Reordered steps, changed command line tool installation
Merge pull request #3 from shaqq/2-setup-fixes

Fixes #2