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
Merge pull request #19 from foresmac/master

YO DAWG I HEARD YOU LIKE SALAD
Seriously, you can't make this stuff up.
Merge pull request #20 from foresmac/master

Seriously, you can't make this stuff up.
Merge pull request #1 from vokalinteractive/master

pull from upstream