Removed dependencies on manifests.
Merge pull request #217 from sprowell/master

Removed dependencies on manifests.