Revert manifest version to 2
Merge pull request #252 from tlvince/bug/manifest-version

Revert manifest version to 2, closes item:417