update gitignore and gh-pages update script
Merge branch 'master' of github.com:gengo/decanter
Merge pull request #35 from hermanschaaf/master

Small session bugfixes
start on lib.crypt tests
update test to work with python 2.6
update test
Merge branch 'master' of github.com:gengo/decanter
if it is a json request, use request.json
Merge pull request #36 from shawnps/master

update decorator to use request.json when the Content-Type header is set to JSON
fix importing