Fix includes so states can be run independently

If you try to run collectd.df (or any other state) individually, it fails
because it includes the service state file, but the service requires the
package state. We can't just include the package state in the service state
because it would cause a circular dependency.
Merge pull request #9 from iggy/for-upstream-fix-includes

Fix includes so states can be run independently