Munki 3.1.1 Official Release

Revert "Move some makepkginfo code into a lib module that can be call…

…ed by other code (like, say munkiimport...)"

This reverts commit ff5c6cedf5a200588803edfee143069f76e27000.