respond to pr about template magic
addressed comment about failing hard on icon
addressed as_json
addressed media_type sillyness
explicitly throw error on using search
made megabyte num into constant, also fixed a bug that allowed you to queue multiple files in single file upload, and another bug that didn't show the 'add files to queue' message in bulk upload
address remaining PR things
Merge branch 'mm-map-updates' into s2