Merge develop, move to use staticfiles

Title says it all.  So many changes, it's almost impossible to see the staticfiles stuff I did.  So you'll just have to merge, on faith :)