Add ordereddict>=1.1 as a new dependency
Fix PEP8 Issues