Updated main makefile, each package now has it's own makefile.
Merge remote-tracking branch 'upstream/master'
Fixing castle makefile, changing castle config from 'castle.config' to 'castle.conf'