Merge branch 'master' of https://github.com/burtbeckwith/optimus
Merge branch 'master' of https://github.com/satvaimal/optimus
Fixing error status on controller unit tests