Move cassandra model stuff to its own file
Fix src files to use CassandraModel
Fix tests
Remove System.out.printlns
Merge pull request #180 from lakshmi-kannan/bf_get_column_family_from_gran_and_type

RFR: Get column family given granularity and rollup type
Make CF mappers private
Merge pull request #184 from lakshmi-kannan/bf_cleanup_cf_mappers

Make CF mappers private
make dockerfile work again
undo wildcarding. find a solution that works later
work with new all-modules target
Merge pull request #187 from fourk/fix_docker

Fix dockerfile to work again.
fix intermittent test failures from race cond
Rename Metric.Type to Metric.DataType and rename StatType to RollupType
Drop STATSD_ prefix from rollup types
Merge pull request #189 from lakshmi-kannan/bf_types_refactor

RFR: (Refactor) Rename Metric.Type to Metric.DataType and rename StatType to RollupType
Merge pull request #188 from fourk/fix_intermittent_test_failures

Fix intermittent test failures from race condition
Move ROLLUP_TYPE to MetricMetadata class
Merge pull request #190 from lakshmi-kannan/bf_move_rollup_type_cache_key

RFR: Move ROLLUP_TYPE to MetricMetadata class...
Merge branch 'master' into statsd_module

Conflicts:
	blueflood-core/src/main/java/com/rackspacecloud/blueflood/types/StatType.java
remove counter from simple types.