akleeman/slocum — pull request #8 by ms8r (2014-03-03 07:50:12+00:00)
Title: Noconflicts

This is the PR that just has the old merge conflicts in slocum.py and objects.py resolved. If you can merge this one into your master, I can then branch off that merge commit - thanks.