Removed CNAME file mistakenly added to the master branch
Ignore custom settings.sbt
Merge branch 'master' of github.com:agemooij/riak-scala-client into 2i-iteratees