THINK-159-TRN

Changing and updating gems to speed up travis test suite. Also running general repo tidy.