fixes
Merge branch 'master' of https://github.com/MartianKnight/hackathon.koding

Thanks Chris