Resubmit for 2.1
Remove extract, fix SNAFU
Revert "Resubmit for 2.1"

This reverts commit 5fb7067cef6b26c37ec92d8d477714de0557a6db.

Conflicts:
	includes/shortcodes.php
Fix SNAFU... take 2
Merge branch 'issue/1922' of https://github.com/ghost1227/Easy-Digital-Downloads into ghost1227-issue/1922
Fix undefined indexes and a few formatting issues.#2412
Merge branch 'ghost1227-issue/1922' into release/2.1
Merge branch 'release/2.1' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/2.1