fix script ref
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o
changing some defaults
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o
image fixes for ubuntu 14.04 lts
Merge pull request #210 from usergrid/cloud-formation-scripts

Fixed awscluster scripts so they work with Ubuntu 14.04
Progress on REST tests passing with Core Persistence: Tests run: 150, Failures: 5, Errors: 86, Skipped: 8
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into Conversion_to_faster_2.2.0

# By Shawn Feldman (3) and Dave Johnson (1)
# Via Dave Johnson (3) and Shawn Feldman (2)
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Progress on REST tests passing with Core Persistence: Tests run: 150, Failures: 5, Errors: 86, Skipped: 8
  image fixes for ubuntu 14.04 lts
  changing some defaults
  fix script ref

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/persistence/EntityRef.java