Move bower/build to bower/convert
Merge branch 'master' of github.com:rails-assets/rails-assets

Conflicts:
	Rakefile