Switched parsing to use faster lookahead version of alt().
Merge branch 'master' of https://www.github.com/foam-framework/foam
Reverted parser change.  Was breaking DemoCat.