Merge pull request #1 from slackhq/master

update to 1.1