Merge pull request #1 from koding/master

spring cleaning