Update settings sample
Ignore settings.json
Move docs
Update ignore for OS X junk
Merge branch 'master' into 1.0