cut dane quote
Merge branch 'master' of github.com:specialorange/IDC2014
a small reorg