mozilla-boxen/base-boxen — pull request #10 by lonnen (2013-12-11 17:04:17+00:00)
Title: how did those commits get there

somehow my boxen and mozilla boxen diverged. merging them back together so we're one big happy boxen.