Moving some constants around
Merge branch 'master' of https://github.com/burundiocibu/bling