Merge branch 'master' of github.com:Aloja/aloja into aaron
updating apt sources travisCI
Merge branch 'aaron' of github.com:Aloja/aloja into metricvsmetric