Added EdgeCast to acceptable domains

Also upgraded py.test and now using fixtures instead of funcargs, and a bit of code cleanup too.