Merge pull request #5 from joshuamaxwell/katy

Merging some style foundations
Merge pull request #6 from joshuamaxwell/master

Merge pull request #5 from joshuamaxwell/katy