Fix demo, get ready for bower