clean up formatting
Merge branch 'master' of https://github.com/dom-dom-dom/ineetu-ror
mergin?