jdate removed
set js tabstop=2
Merge