add support for SURF features
config: add some more comments and settings
Merge branch 'master' into docs