Merge branch 'release/release-2-26-2014_1.6.0' into development
CL update
Update behat_editor_tokenizer.module

pulling in the path for urls as well
Ready to test dev
Clean out .idea
Merge branch 'development' of github.com:alnutile/behat_editor into development
Merge branch 'development'
cl
Push token work