prepare for bower
Merge branch 'master' into bower

Conflicts:
	index.html
update cdbui
Merge branch 'master' into bower
move fonts => bower
Merge pull request #39 from CartoDB/bower

prepare for bower