RSpec: Updated Guardfile to run features tests on controllers updates.
Merge remote-tracking branch 'upstream/master'