4bcac560

By: Michael Lynch <git@mtlynch.io>

Merge branch 'slice-2' into slice-3

# Conflicts:
#	handlers/upload_test.go
#	store/sqlite/media_test.go