Merge branch 'master' of github.com:PRX/pop-up-archive
Merge branch 'master' of github.com:PRX/pop-up-archive
Messing with ng
Merge branch 'master' of github.com:PRX/pop-up-archive
Merge branch 'master' of github.com:PRX/pop-up-archive
Bumping ruby-version since 374 actually works
Merge pull request #13 from chrisrhoden/csv_import_backend

adds a better json representation for csv imports
Merge branch 'master' of github.com:PRX/pop-up-archive
Uploads
Don;t fail controller test
Merge pull request #14 from farski/master

Uploads