Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
copy over default.json from esformatter and add preset=default
have config load default style settings from defaultStyle.json
Merge pull request #38 from brettlangdon/default-style

default style guidelines