Merged piratebox-mod-imageboard

Merged piratebox-mod-imageboard and fixed some whitespacing.