Merge pull request #114 from turboencabulator/cleanup
authorlangou <julien.langou@ucdenver.edu>
Mon, 23 Jan 2017 10:43:08 +0000 (11:43 +0100)
committerGitHub <noreply@github.com>
Mon, 23 Jan 2017 10:43:08 +0000 (11:43 +0100)
Assorted Makefile fixes


Trivial merge