Simple reformatting of code
Added ability to use next() to short-circuit entity loops
Merge branch '1.0.7' of github.com:DeegC/zeidon-joe into 1.0.7