Remove redundant if, simplify.
Merge branch 'reorg' of github.com:wireload/screenly-ose into reorg