fix indent
add .editorconfig

see: http://editorconfig.org/
trim trailing whitespace
update HISTORY
Merge branch 'master' into tmp/ruby-2.0.x