Merge branch 'crosscat'
remove flowdock thingy