clean up code
update head
celestrium head
Merge branch 'master' into directed

Conflicts:
	src/www/scripts/main.coffee