Prep repository gh-deploy. Fix issue where clock would not update.
Merge branch 'master' of github.com:ericwright90/jolly-nap

Conflicts:
	src/javascripts/application.coffee
	src/stylesheets/application.sass
	src/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss
	src/stylesheets/bourbon/_bourbon.scss
	src/stylesheets/bourbon/addons/_button.scss
	src/stylesheets/bourbon/addons/_clearfix.scss
	src/stylesheets/bourbon/addons/_font-family.scss
	src/stylesheets/bourbon/addons/_hide-text.scss
	src/stylesheets/bourbon/addons/_html5-input-types.scss
	src/stylesheets/bourbon/addons/_position.scss
	src/stylesheets/bourbon/addons/_prefixer.scss
	src/stylesheets/bourbon/addons/_retina-image.scss
	src/stylesheets/bourbon/addons/_size.scss
	src/stylesheets/bourbon/addons/_timing-functions.scss
	src/stylesheets/bourbon/addons/_triangle.scss
	src/stylesheets/bourbon/css3/_animation.scss
	src/stylesheets/bourbon/css3/_appearance.scss
	src/stylesheets/bourbon/css3/_background-image.scss
	src/stylesheets/bourbon/css3/_background-size.scss
	src/stylesheets/bourbon/css3/_background.scss
	src/stylesheets/bourbon/css3/_border-image.scss
	src/stylesheets/bourbon/css3/_border-radius.scss
	src/stylesheets/bourbon/css3/_box-sizing.scss
	src/stylesheets/bourbon/css3/_columns.scss
	src/stylesheets/bourbon/css3/_flex-box.scss
	src/stylesheets/bourbon/css3/_font-face.scss
	src/stylesheets/bourbon/css3/_hidpi-media-query.scss
	src/stylesheets/bourbon/css3/_image-rendering.scss
	src/stylesheets/bourbon/css3/_inline-block.scss
	src/stylesheets/bourbon/css3/_keyframes.scss
	src/stylesheets/bourbon/css3/_linear-gradient.scss
	src/stylesheets/bourbon/css3/_perspective.scss
	src/stylesheets/bourbon/css3/_placeholder.scss
	src/stylesheets/bourbon/css3/_radial-gradient.scss
	src/stylesheets/bourbon/css3/_transform.scss
	src/stylesheets/bourbon/css3/_transition.scss
	src/stylesheets/bourbon/css3/_user-select.scss
	src/stylesheets/bourbon/functions/_compact.scss
	src/stylesheets/bourbon/functions/_deprecated-webkit-gradient.scss
	src/stylesheets/bourbon/functions/_flex-grid.scss
	src/stylesheets/bourbon/functions/_grid-width.scss
	src/stylesheets/bourbon/functions/_linear-gradient.scss
	src/stylesheets/bourbon/functions/_modular-scale.scss
	src/stylesheets/bourbon/functions/_px-to-em.scss
	src/stylesheets/bourbon/functions/_radial-gradient.scss
	src/stylesheets/bourbon/functions/_render-gradients.scss
	src/stylesheets/bourbon/functions/_tint-shade.scss
	src/stylesheets/bourbon/functions/_transition-property-name.scss
	src/stylesheets/images.sass
	src/stylesheets/normalize.scss
	src/stylesheets/partials/_animations.sass
	src/stylesheets/partials/_base.sass
	src/templates/index.slim