WIP
Bumped version requirement back up to 5.4 to allow for traits.
Merge branch 'feature/decorator' into develop
Bumped travis PHP version to 5.4.