Clean up makefile output
merge of '4439cb0d4cbdd714900273efb340756b630f471a'
     and '6013fb6a24265dd956d96ccbe5b6ef5e2fd65353'
Blind fix attempt for Visual C++ 2013 (github issue #5)