Merge pull request #5 from sbjustin/master

Lots of formatting changes
Making things a bit easier on the eyes (mine anyway)
Merge pull request #6 from rubyloco/stylin

Making things a bit easier on the eyes (mine anyway)