Remove some temporary server-migration stuff
Move all *.html.haml -> *.haml
Rebrand kinda!