Merge pull request #68 from ebfe/fix-build-master

Fix build with rust master
Fix bug: was skipping some matches because of over-eager optimisation
gitignore
Update imports for namespaced enum variant changes