Updated to support EF6-RC1 reorganization
Merge pull request #5 from mick-wilson/master

Updated to support EF6-RC1 reorganization