Merge pull request #1 from drupalprojects/7.x-1.x

7.x 1.x since github defaults to master..
test

test to see if I can commit
this is a patch
Merge pull request #4 from mmilutinovic1313/master

Start of retaining capabilities of existing files on file system. travis says failed but that's just HHVM (which I'm removing from the testbed now)