Fix up space
Merge branch 'master' of github.com:infobelt/skye
big restructure for 0.3 as we build out the OMS/OMR infrastructure