Major code cleanup
save me from having to create this every time
Correcting deploy now that tmp will always ship with the site
Serious code cleanup