Use preferred Eclipse gitignore.
Improved behaviour parser.
Fix conflicts.