Dev/merge upstream 20130418

Merges in some changes, most importantly a use of `.blank?` that was breaking a lot and was fixed nearly a year ago in the upstream repo.

Tested on a 12.04 vagrant and a 12.04 lab box. Obviously would be good to test somewhere that a custom plugin dir is used, as that was the main difference between the two branches.