Update version to 3 part
Merge branch 'master' of https://github.com/mozilla/cookiemonster
Clean up unused files