Cosmetics
Merge branch 'master' of github.com:korczis/lola

Conflicts:
	lib/loader.js
	test/mainSpec.js