Major revisions.
Merge remote-tracking branch 'origin'

Conflicts:
	imgur.sh