Merge pull request #16 from foresmac/master

He said these two things minutes apart.
Hack Day Goodness!
hadn't pulled from upstream in awhile
Merge pull request #17 from StoicJester/master

Hack Day Goodness!
bro.
Merge pull request #18 from MichaelButkovic/master

bro.
Fix formatting
YO DAWG I HEARD YOU LIKE SALAD