Replace Riak if we are building an EE package
And now with a better understanding of how these templates work
Fixes for debian control template

Puts the `Replace:` and `Conflicts:` lines in the correct place
Merge pull request #173 from basho/fixes/lrb/deb-template-fix

Fixes for debian control template
Finishing the merge from replace-riak-if-ee