Squashed commit of the following:

commit 12050744b67ee039112245371facf361299597c1
Author: Sam Marcuson <sammarcuson@me.com>
Date:   Thu Feb 13 14:44:34 2014 +0000

    all partials renamed and screen.scss updated