Merging unstable into master (prep for 1.5 release)

This is mostly uninteresting, since the cordova-ios repo originated with 1.5 anyway.  Just a few changes I've added over the last couple of days.