Skipped authorization for data_set export and media show.
Merge remote-tracking branch 'upstream/master' into jp735
Revert "-Added proper sizing hooks for vis page."

This reverts commit d9c087b2b4be3c1760e8968862a6b6fefc14ffb5.
Merge pull request #781 from NatTuck/revert-skittles-face

Revert "-Added proper sizing hooks for vis page."
Merge remote-tracking branch 'upstream/master' into jp735
quickfix for skittles viz resize
Merge pull request #783 from jdalphon/generalChanges

quickfix for skittles viz resize
Yet another bug with postgres
Yet another bug with postgres
Updated functional tests for data sets so that manualUpload is performed.
Merge remote-tracking branch 'upstream/master' into jpUploadDataTest
Merge remote-tracking branch 'upstream/master' into jp735
Merge pull request #789 from jdalphon/generalChanges

Yet another bug with postgres
Merge pull request #790 from jaypoulz/jpUploadDataTest

Updated testing so that it performs a valid manualUpload test.
Merge remote-tracking branch 'upstream/master' into jp735
Merge pull request #780 from jaypoulz/jp735

Skipped authorization for data_set export and media show.