Removed django 1.5 - no security updates - Pegged Markdown for Python 2.6
Merge pull request #258 from zmetcalf/update_travis

Removed django 1.5 from Travis - due to no security updates.