Merge pull request #440 from git-harry/sprint

Merged automatically by jenkins after successful gate test
Serialize non-string facts
CYA w/ a tidy little basestring
Clean up pep8 failure
Merge pull request #441 from mattt416/serialize_if_necessary

Merged automatically by jenkins after successful gate test
Merge pull request #442 from git-harry/sprint

Merged automatically by jenkins after successful gate test
Add tests for parent_clobber False vs None fix in the past and other
falseish values.
Removed unused variables/imports
Don't need those lines at all. Derp.
Merge pull request #444 from claco/add-false-inherits-tests

Merged automatically by jenkins after successful gate test
Centralise ID validation and throw useful exception.