more cleanups
Remerged mikko's code.

Merge branch 'dev' of github.com:miohtama/ztanesh
Added aliases for OpenOffice to LibreOffice