Add support for "--tab-width" option
Style tweaks
Fixed conflicts
Merge branch 'evsheffield-master'