zagales-diy-16 us2.1 - travis now runs ruby's tests also
Merge remote-tracking branch 'origin/zagales-diy-16' into zagales-diy-16

Conflicts:
	Gemfile
zagales-diy-16 us2.1 - travis now runs ruby's tests also