Add note to deploy.rb about .htaccess files
Linebreak fix
WP 3.9.2
composer update
Merge pull request #97 from etcook/master

WordPress 3.9.2
Merge branch 'master' of https://github.com/roots/bedrock into feature/pullfork

Conflicts:
	config/deploy.rb
Merge branch 'feature/pullfork' into develop
remove .rb
Merge branch 'release/1.2.6a'