Merge branch 'master' into dustin
Did a short-term fix to the download mechanism.

Should prevent massive memory usage, and speed everything up (no longer two steps).
Fixed merge conflict.