Significantly improved regex matching in parser.js. Because of this, I
could remove a good number of redundant terms. Fixed merge conflict in config.js.