correcting travis yml
Merge branch 'aaron' of github.com:aloja/aloja into azureProd
Added logrotate to puppet