Add CodeSniffer as a Composer dependency

Also updates develop branch with 2 commits from the master.