change default plane size in featpyramid matlab demo to 1100x1100.

the decrease from 2000x2000 to 1100x1100 should consistently allow running on GPUs with less than 4G of memory (i.e. 2G).
Merge branch 'featpyramid' of https://github.com/forresti/caffe into featpyramid

Conflicts:
	matlab/caffe/featpyramid_matcaffe_demo.m
convnet_featpyramid matlab function takes parameters as second arg
changes to convnet_featpyramid matlab interface

return value is now a scalar structure array with fields 'feat' (a cell array of 3D numeric arrays) and 'scales' (a 1D numeric array).