changing the makefile praying it works
Replaced distribute with setuptools in requirements.
[#UX-1889 transition:31]
Removed distribute flag from virtualenv for cleanliness.
[#UX-1889 transition:31]
Merge tag 'JIRA-UX-1889-SIGNOFF-1' into integration

Approved for merge.

MERGE: JIRA-UX-1889 > integration
Merge tag 'RELEASE-2013-10-28-SIGNOFF-1' into production

Approved for merge.

MERGE: RELEASE-2013-10-28 > production