Merge pull request #6 from thewacokid/2.5dev

2.5dev - updated for the newest code in master
Needed additional #ifdefs around plfs_error_t
Pass back errors
Merge branch 'plfs2.5dev' of github.com:fs-test/fs_test into 2.5dev