Shopify/huboard — pull request #4 by kvs (2014-07-16 02:03:59+00:00)
Title: Merge upstream

Merge latest upstream.

Part of the split from #3

r: @wisq @phoet @jduff