Added the better_code_samples plugin.
Added better_code_samples plugin, fixed merge conflict in .gitmodules
Merge branch 'ChrislS-master'