Merging master down into bagit-resque

mostly google analytics stuff