Added search and replace to error messages
Merge branch '2.0' of git://github.com/cloudmanic/php-warchest into 2.0