fixing markdown/textile php script mime-types
Fixes a bug where saving an extisting page causes a duplicate slug error
Merge pull request #470 from NicNLD/slug-patch

Fixes a bug where saving an extisting page causes a duplicate slug error
Merge pull request #471 from marekmurawski/mime-types

Fixing markdown/textile php config script mime-types
Merge branch 'master' into record-finder