Merge branch 'dev'
Small fixes

Mod: fixed errors with repetition in merger
Ref: fixed output line check in rules, also added comments explaining
Mod: now officially HTML5, added doctype and fixed css
Ref: fixed up some fringe cases/line width in base
Added tests
Merge branch 'dev'
Version number update
Version number update + dev cache bust