Fixed pandoc in setup
Merge branch 'master' of github.com:jrief/django-angular