changes line-height calculation once again

now: one line-height calculation to rule them all
Merge branch 'master' of https://github.com/heartbeeed/Pilot