Cleanup.
Merge branch 'master' of github.com:bkaradzic/bx
Merge branch 'master' of github.com:bkaradzic/bx