Merge pull request #3 from johnb30/master

Update for newer setup. BECAUSE PETRARCH.
Merge pull request #4 from johnb30/master

Install base packages, etc., etc.
Stupid renames.
Merge remote-tracking branch 'upstream/master'