Merge branch 'master' of github.com:Aloja/aloja into aaron
Remove unneeded files vagrant
Fix permissions of logs directory

The aloja-web/logs directory was mounted as 755 vagrant:vagrant, but PHP scripts are executed as www-data:www-data, which can't write to the log file and aborts the request.

Now the folder is mounted as 775 www-data:vagrant, so both users can modify the file (no more errors!).

Also, the file aloja_dev.log has been removed, because it was gitignore'd but still present in the repo, so changes were still tracked.
Merge pull request #3 from jcugat/fix-logs

Fix permissions of logs directory
Merge branch 'master' of github.com:Aloja/aloja into aaron
Removed duplicate vcsrepo entry in puppet
updating apt sources travisCI
Merge pull request #4 from jcugat/fix-puppet

Removed duplicate vcsrepo entry in puppet
Execute benchmarks on the vagrant machine
Merge remote-tracking branch 'origin/master'
Changed float breakpoint bootstrap
Merge branch 'master' of github.com:Aloja/aloja into aaron
merging with aaron