Merged with qminer/qminer master. Some additional cleaning of make files.