Update the makefile to use the new build system. Update refs
Merging from albert-wang/master
Admin emails can delete images
Removing some stuff