Merge branch 'master' of github.com:mtth/flasker

Conflicts:
	flasker/ext/api.py
Merge branch 'master' into gh-pages
Update.