cleanup

Removes debris from mishandled merge conflict (bee0c8, 9d429b);
reindents template; fixes home link in a cleaner way than c1183f;
repairs reply form appearance.

[fixes #6, #13]