Remove two obsolete packages from trying to install on install media
Merge branch 'master' of github.com:pcbsd/pcbsd