finish prelim updates on HQ
Merge branch 'master' of https://github.com/skoppula/yummycode-2014
midway updates on COWBOY