Changed a bunch of stuff around.
Merge remote-tracking branch 'upstream/master'
removing html suffixes again