Updated 0.4 templates for the last time.

* Minor fixes.
* Added 'pushd' and 'popd'.