Merge Dev branch.

Finally correct travis/rspec issues.