Merge pull request #37 from modcloth/master

A jumbled mess of changes :scream_cat: