Changed layouts to use util.format instead of my own implementation
added some test output files to gitignore
Merge branch 'master' into util.format
Getting my lint on (via bob)
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting
more linting