updated SSO
update to fix portal logout
Merge branch 'gh-pages' of github.com:apigee/usergrid-portal-internal
fixed invalid token logout
removed redundant logout call
Merge pull request #2 from eabay/vagrant

vagrant usage to provide identical development environment
Merge branch 'master' of github.com:apigee/usergrid-portal-internal into current-portal
Merge branch 'development' of github.com:apigee/usergrid-portal into current-portal

Conflicts:
	js/app/usergrid.appSDK.js
Merge branch 'master' of github.com:apigee/usergrid-portal-internal into portal-redesign

Conflicts:
	js/app/usergrid.appSDK.js
Merge branch 'development' of github.com:apigee/usergrid-portal into portal-redesign

Conflicts:
	js/app/usergrid.appSDK.js
updated readme situation
Merge branch 'development' into compass