Updates framework
Merge branch 'osxfuse-2' of github.com:mekentosj/osxfuse into osxfuse-2