Heavy re-write of manifests. Previously did not work as expected
Version bump.
Merge pull request #14 from myoung34/dev

Dev