Working on pulling autoformatter into vim plugin
Improvements to autoformatter