Fixed up Makefile to work with new file structure.
Merge branch 'master' of github.com:jbmorse/Dragonfly

Conflicts:
	Makefile