Added variables with sane defaults.
Removed libreoffice from installed packages.
Fixed map import.
Amended paths, added pillar variables.
Fixed how pillar data is retrieved for tomcat.
Fixed paths with pillar data.
Fixed paths and user/group with pillar data.