Fix a bunch o' clang warnings

(and a bunch of whitespace truncations that Atom oh-so-helpfully seems to have insisted upon)