Nick O: Updated license details and prepared for travis build