pulled from pigeonflight
Merge branch 'pigeonflight-master'

Conflicts:
	.gitignore
	src/lessArcane.coffee
	static/index.html
	static/js/lessArcane.js
merged with upstream master