Add git gutter plugin
Fix merge conflict, add phpunitqf