Pyramid: Added basic note editing implementation
Django: Modified .gitignore
Merge branch 'django'
Merge branch 'master' into pyramid