Fixes #19 (better install) and fixes #21 running locally.

Sorry these aren't split out but ended up with a fix for #19 after fix for #21.