Merge branch 'develop' into feature/issue-16-featured-discussions-extra-test
use pip to isntall
getting travis to run tests
Merge branch 'feature/issue-19-tests-failing-to-run' into develop
Merge branch 'develop' into feature/issue-16-featured-discussions-extra-test
Merge pull request #20 from praekelt/feature/issue-16-featured-discussions-extra-test

Extra test for issue raised in #16
Merge branch 'develop' of github.com:praekelt/ghr-mobi into develop
Dropped random image test - useless.
Changed the tunobase package to pull from Github.
Upped tunobase version to 1.0.4
Swapped USE_CELERY for CELERY_ALWAYS_EAGER.
Merge branch 'feature/issue-2-fix-tunobase-dependency' into feature/issue-13-use-CELERY_ALWAYS_EAGER-instead-of-USE_CELERY
Ignore production_settings.py
Use the randomize_answers keyword argument for the poll widget on the homepage.
Merge pull request #23 from praekelt/feature/issue-15-randomize-poll-questions

Feature/issue 15 randomize poll questions
Manually merged in develop.
Manully merged again.