Merge pull request #28 from oghm2/devel

Merge branch 'devel', remote-tracking branch 'upstream/master' into deve...
Added simplejson to requirements.txt
Merge pull request #30 from jvc26/simplejson

Added simplejson to requirements.txt
Merge branch 'master', remote-tracking branch 'upstream/master'
License under MIT license
Integrate with TravisCI builds
Merge pull request #32 from jvc26/travisci

Travisci integration for cellcounter
Merge branch 'master', remote-tracking branch 'upstream/master'
Fixed minor error in submit.html template
Fixed header links to not use relative URLs
Merge pull request #34 from jvc26/fix-links

Fix links
Merge branch 'master', remote-tracking branch 'upstream/master'
Default to 'False' on DEBUG unless environment variable set to True
Set DATABASE_URL environment variable for Travis builds
Only test cellcounter main app, not all of Django
Merge pull request #35 from jvc26/fix-travis

Fix travis
Add travis build status to README.md
Merge pull request #36 from jvc26/fix-travis

Add travis build status to README.md
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge pull request #33 from jvc26/license

MIT based license for Cellcounter