Switch from -o to --out-dir.
Revert to using -o for tests
Merge pull request #26 from kmcallister/otest

Revert to using -o for tests
Add 'vertical-align'