added license, doh!
Merge branch 'master' of https://github.com/flitbit/diff