Awood/systemd

Also changed the %defines to %globals.  See https://fedoraproject.org/wiki/Packaging:Guidelines#.25global_preferred_over_.25define