Simplify sysv script
genshi balked on some expansions, but they are unneeded anyways
Merge branch 'develop' into hhu