fix pegs
upgrade to pegjs HEAD (post 0.7)
stop making js
auto-join, whitespace and typos