Merge branch 'release-0.3.13' into develop
Fix for errors caused by lazy-loaded models
Merge pull request #25 from dieselmachine/django1.6

Fix for errors caused by lazy-loaded models
Bumped version
Merge branch 'release-0.3.14'