Makefile touchups
Merge branch 'master' of github.com:Nekroze/ninjar

Conflicts:
	Makefile