branch merge
add manifiest and bump version number to for prep for cheeseshop
Merge pull request #1 from jfrelinger/master

Pulling in manfest work from jacob