Merging serve with lib/server
Merge branch 'master' of https://github.com/Iteam1337/wejay.player
Gotta catch'em'all...

...or at least get them to play nice together
Merge branch 'master' of https://github.com/Iteam1337/wejay.player

Conflicts:
	lib/index.js
Build now rebuilds templates

Duh!