wip
limiting native_transport_max_threads to 64 due to Mac limit
wip
wip
wip
merged from master
remove non-javadoc & added missing @Override annos
merged from master
updated java config
DATACASS-66 - closed
removed Alex
Merged DATACASS-62
DATACASS-64 : DONE : Removed old QueryOptions Map.
Merge branch 'master' of local repository into DATACASS-52

Conflicts:
	README.adoc
Merge branch 'DATACASS-52' of https://github.com/SciSpike/spring-data-cassandra into DATACASS-52