unicorn changes
Merge branch 'master' of github.com:alexstoick/parserizer

Changes on local unicorn config file.