Rebase and merge bower master into GitHub https proxy changes and tested.