Merging everything into a single commit
Merge branch 'rebase-1' of github.com:vmalarcon/koding into rebase-1