Isolated package mapping and some fixes

Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made