iFixit/pulldash — pull request #31 by freshvolk (2013-07-16 00:19:16+00:00)
Title: Resolve the differences between master and ks

A few random changes from prod that needed to be added to master.