Merge branch 'master' of http://github.com/michaelvli/altoids