Merge pull request #1 from arax/master

Clean-up and refactoring
Update .travis.yml

removed installation of libonig-dev as it is only needed for the OCCI Parser