Merge pull request #6 from Islandora/7.x

update 7.x
splitting out web test case and unit test case
er, add the includes too
better error handling
accept objects with/without wrapper
erm, forgot one
last bit of bugfixes and cleanup
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
conflict resolution
Merge branch 'qadan-7.x' into 7.x
better, simpler drupal filter handling
not using t() like some sorta madman
Operator precedence allowed for strings that were not 4 or 8 characters long.
Merge pull request #7 from nigelgbanks/7.x-code-review

Operator precedence allowed for strings that were not 4 or 8 characters ...
moving around some stuffs
let's not go nuts
i did an incredibly stupid thing
the stupidity continues
code review changes
static context non-static statics contexts pfft