Delint for 2012-09-03

This is just a simple change with a teeny bit of refactoring so that Tom and I can test our continuous deploy setup