Added api-v1 into travis build
Updated for v2.0 API progress
merging master to v2.0 branch