Testing commit.
Moved conf into /etc/default/
.

Merge branch 'dev'