Updates to debian mirrors and Makefile refactor