add configuration for socket timeout and sub batching
off by 1
hack in some instrumentation
Merge remote-tracking branch 'upstream/emergency-fix' into subbatching

Conflicts:
	blueflood-core/src/main/java/com/rackspacecloud/blueflood/io/AstyanaxIO.java
	blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/Configuration.java
Use new config pattern
Merge branch 'master' into subbatching_batchwriter

Conflicts:
	blueflood-core/src/main/java/com/rackspacecloud/blueflood/io/AstyanaxWriter.java
move sub-batching into BatchSplitter
Metric sub batch size refers to batch size, not number of batches
rename METRIC_SUB_BATCH_SIZE to METRIC_BATCH_SIZE to match actual purpose
Only split batches by batch size

Get rid of splitting a large number of metrics into batches by number of
write threads. This can lead to undefined behavior if the number of
metrics being split gets to be too large (ex- cassandra writes timing out).

Rename batch splitting method `getMetricsAsBatch` to
`splitMetricsIntoBatch` for clarity. Also turn it into an instance
method rather than a static method.
Merge branch 'master' into subbatching_batchwriter
Pass batch size in to constructor rather than getting it from configs as suggested by gdusbabek
Call mark() on metricsWritten metric for every metric processed
Merge pull request #129 from dlobue/subbatching_batchwriter

Subbatching batchwriter
Fix typos in module names
Fix Elasticsearch module name
Merge pull request #130 from lakshmi-kannan/bf_fix_typos

Fix typos in module names