nothin' to see here
remove requiring non-existent file
resolve merge conflict
fix search, make stored query available to search form
check if path exists before operating on it
check if any scripts have been added to the template
add hint for using repeaters
add hint for adding template specific scripts
Merge branch 'master' of github.com:fixate/pw-boilerplate

* 'master' of github.com:fixate/pw-boilerplate:
  yield is a reserved word in php5.5