TODO+cleanup
Merge branch 'sbig' of https://github.com/OpenSkyProject/OpenSkyImager into sbig