Fixed the js-args test; we had the indentation of a comment wrong.  Added an expression indentation test we hadn't covered.
Fixed the js-args test; we had the indentation of a comment wrong.  Added an expression indentation test we hadn't covered.
Merge branch 'master' of git://github.com/OCamlPro/ocp-indent

Conflicts:
	tests/failing.html
We (Jane Street) changed our mind on how much to indent types.
We (Jane Street) changed our mind on how much to indent types.
Clarified Jane Street indentation of indented, parenthesized function calls.
Merge branch 'master' of git://github.com/OCamlPro/ocp-indent
Merge https://github.com/pszilagyi/ocp-indent

Conflicts:
	src/indentConfig.ml
	tests/failing-output/js-comment1.ml