1084 qiita ware#1206

Merged

antgonza merged 3 commits intoqiita-spots:fix-1084from

josenavas:1084-qiita-ware

May 28, 2015

Commits on May 22, 2015

Fixing qiita_ware tests
josenavas
committed

Commits on May 24, 2015

Merge branch '1084-qiita-db' into 1084-qiita-ware
josenavas
committed

Commits on May 28, 2015

Addressing comments
josenavas
committed