Changed jsonify to yajl for json encoding --> a LOT faster
Merge branch 'master' of github.com:sdesbure/Waves

* 'master' of github.com:sdesbure/Waves:
  Changed jsonify to yajl for json encoding --> a LOT faster

Conflicts:
	base/config.rb
bug with invocatinf Sqiwh