Updated .gitignore to include IDEA project files and created top-level POM.
Added .travis.yml file.
Resolved merge conflicts.