Freeze and update requirements
Move 'include' urls to the top of the conf
Merge pull request #227 from steventlamb/topic/reorganize

Topic/reorganize