adapt handling of default in settings
sync with Context as of 2013-09-15
fix Makefile
Merge pull request #18 from phi-gamma/master

sync