More bug fixes. Disabled integrity check :\
Merge branch 'master' of github.com:anupcshan/buddyfs