Use cbn instead of simpl in [simpl rewrite]

[cbn] is better-behaved, and this will be necessary for some automation
in functoriality of adjoints.
Functorial adjoints - composition_of

Also, add non-dependent versions.  I don't know how to state the
dependent versions, though.

Thanks, @mikeshulman, for your help in #629.

After    | File Name                                             | Before   || Change
----------------------------------------------------------------------------------------
0m12.90s | Total                                                 | 0m07.25s || +0m05.64s
----------------------------------------------------------------------------------------
0m10.06s | categories/Adjoint/UniversalMorphisms/FunctorialLaws  | 0m04.36s || +0m05.70s
0m01.90s | contrib/HoTTBook                                      | 0m01.96s || -0m00.06s
0m00.55s | categories/Adjoint/UniversalMorphisms/FunctorialParts | 0m00.39s || +0m00.16s
0m00.28s | categories                                            | 0m00.36s || -0m00.07s
0m00.08s | categories/Adjoint                                    | 0m00.09s || -0m00.00s
0m00.03s | categories/Adjoint/UniversalMorphisms                 | 0m00.09s || -0m00.06s
Merge pull request #630 from JasonGross/adjoint-functorial-parts-more-2

Functoriality of adjoints - respecting composition
./autogen.sh