inconsequential style change that was going to be a test run
:wq
Merge branch '2014' of github.com:kellyalb/nerdsummit into 2014

 the commit.