Merged a lot of lint fixes from the mrlambeth-master branch.