New columns for calcEph, better formatting
Merge branch 'master' of https://github.com/OSCAAR/OSCAAR