Fiddling with htaccess, ho hum...
Merge branch 'master' of github.com:emilbjorklund/thatemil.com