Some more stripping/replacing

Fixed the makefile so I don't explode in anger every time I type make,
started doing more of the replacements while watching an episode of The
Inbetweeners.