use noscrape by default, add opt-out option to disable it
Merge pull request #1187 from tobiasd/20141013

noscrape by default
Update develop from 'master'