fix setup scripts
Merge branch '20140401-dev-stable' into feature-20141215-fix-conversation-glitches