Merge pull request #2 from croydondias/master

Maven 3 support
Re-add note on FIX integration
Merge remote-tracking branch 'upstream/master'