setup fixes

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge branch 'develop' of github.com:erkin/ponysay into develop