Merge pull request #2 from andywillis/master

Added docblockr settings
Changed docblockr base file prefs