hopefully last Makefile mash-up
Merge branch 'master' of github.com:H2CO3/Sparkling
fixed broken build system once again