Fix in the token library (not included in this repo) and some code changes to deal with checking for token folder before looking for files to prevent a 500 error
Merge branch 'development' into release/release-2-11-2014_1_5_8
Fixes
Merge branch 'release/release-2-11-2014_1_5_8' of github.com:alnutile/behat_editor into release/release-2-11-2014_1_5_8
Needed to make these work with the new token library
Minor fixes
Found a bug during testing build outs
Remove the behat.yml delete pound out
Remove the behat.yml delete pound out so that it is deleted after every testwq
Fix merge issue