Merge pull request #107 from sinker/master

bringing everything in the universe back into balance
Merge pull request #108 from sinker/master

new photo of the fellow
Merge remote-tracking branch 'upstream/master' into newspartners
oh man I am fucking up snapjs right from jump
more fuckery