Sad, pathetic XML is better now
Merge branch 'master' of github.com:PRX/pop-up-archive

Conflicts:
	lib/import/youreusFINAL2.xml
Merging w/ Andrew's stuff