Change author name to match github username, fix formatting (remove tabs, fix indentation) of ColumnModifier.java.
Merge branch 'master' into si