Updated vim bundles, support for Cassandra 2.x alias, maven cleanup