added option to disable spatial pooling for locally connected maxout layer, and made this the default