mattdrayer/rebase-20140916: Initial test fixes
Merge pull request #246 from edx-solutions/mattdrayer/rebase-20140926-testfixes

mattdrayer/rebase-20140916: Initial test fixes