Fix for incorrect loading layout from nib

Fixing issue described here:
https://github.com/steipete/PSTCollectionView/issues/157
Merge pull request #254 from fduch2k/master

Fix for incorrect loading layout from nib
Merge remote-tracking branch 'upstream/master'