tabs to spaces & update email addy
Merge remote-tracking branch 'origin/osx_cole_inigral'