addition of shoreline which replaces user-api
armada has been sunset-ed so lets remove
fix name to be shoreline
remove group rule
Merge branch 'master' into jhbate/shoreline

Conflicts:
	runservers
comment out user-api for now
un-comment tp_user-api
Merge pull request #17 from tidepool-org/jhbate/shoreline

Jhbate/shoreline