run the dev server with AutoAPI already done
updating docs to show new super quick start
update method reference
Merge branch 'test_server'
testing travis.yml
minor change to trigger first travisci build
fix travis.yml typo
stupid typos
Fixes json import to import json directly from python. Fixes all occurences of simplejson -> json.
Merge pull request #17 from keppy/master

Fixes json import to import json directly from python. Fixes all occuren...
remove 1.7 cause it's not out yet, add tests module to setup.py
make tests findable in both 1.6 and 1.5
fixing some python3 compatibility issues
fix remaining base string references, add python3.3 testing, specify content-type in test for DJ1.4
fix merge conflicts in conduit/tests/__init__.py
move around where the tests are located for Django1.6 changes