Cleaned up for travis and composer integration.