update to validator 2
remove variables.js stuff
escape the - in the regexp character set
Merge branch 'master' of git://github.com/discore/discore-interface