Use upstream intercity gem and update deploy config samples