Issue 1048 - File path consistency  for robots.txt and .htaccess paths
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-1048-file_editing
Merge pull request #1051 from jrfnl/Issue-1048-file_editing

Issue 1048 file editing