cleanup
Merge branch 'add-flowdock-notification'