Clean before normal builds, make 100% sure we dont get old files
do what i just did better
Clean up makefile
Merge remote-tracking branch 'team/master'