Merge pull request #2 from travisbrown/wwa_tests

Configuration
Added Bunsen files back in.
Quick and dirty implementation of marginal annotation annotations.