Merge pull request #77 from discipolo/7.x-1.x

Pulling changes from drupal.org
Merge branch '7.x-1.x' of github.com:Pushtape/pushtape into 7.x-1.x
Update drupal-org.make

using discipolos version of discography (includes simpletests)
use my versions
Merge branch '7.x-1.x' of https://github.com/discipolo/pushtape into 7.x-1.x-pushtape-omega

Conflicts:
	drupal-org.make