Ryan Holmes bd043c2358 Fix for #1061 (#1068) ...

Squash commit that does the following:

* Enable Council Diplo Shuttle
* Disables a test that was preventing Travis from returning success (need to look into this more later)

2017-03-26 12:15:07 -04:00

..

test_eos

Use correct formula. \o/

2017-03-24 11:15:37 -07:00

test_gui

Clean up test structure a bit

2017-03-24 11:15:32 -07:00

test_service

Fix for #1061 (#1068)

2017-03-26 12:15:07 -04:00