small changes to defaults
Merge remote-tracking branch 'origin/master' into gh-pages

* origin/master:
  small changes to defaults
deploy