Kill build errors
Merge branch 'master' of https://github.com/slowbot/rebar

Conflicts:
	build/stylesheets/all.css
Merge branch 'master' of https://github.com/slowbot/rebar