environment variables
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	instaOauth/authenticate.js
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	instaOauth/authenticate.js
not sure
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	controllers/userController.js
fixes for invite logic on responses.  added decline failsafe
Merge branch 'master' of https://github.com/g-palmer/hashtags