diff --git a/README.md b/README.md
index da72876..694a918 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,8 @@ Every sample in the demo requires some basic credentials from your Twilio accoun
 When you generate an API key pair at the URLs above, your API Secret will only be shown once -
 make sure to save this information in a secure location, or possibly your `~/.bash_profile`.
 
+Note also that in this starter kit, variables set in `.env` will override those in your `.bash_profile` and/or `.bashrc`.
+
 ### Configure product-specific settings
 
 Depending on which demos you'd like to run, you may need to configure a few more values in your `.env` file.
diff --git a/app.py b/app.py
index ac27e42..e32c4fb 100644
--- a/app.py
+++ b/app.py
@@ -22,7 +22,7 @@ def snake_case_keys(somedict):
 app = Flask(__name__)
 fake = Faker()
 dotenv_path = join(dirname(__file__), '.env')
-load_dotenv(dotenv_path)
+load_dotenv(dotenv_path, override=True)
 
 @app.route('/')
 def index():
diff --git a/tags b/tags
new file mode 100644
index 0000000..7750bd7
--- /dev/null
+++ b/tags
@@ -0,0 +1,24 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME	Exuberant Ctags	//
+!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
+!_TAG_PROGRAM_VERSION	5.9~svn20110310	//
+app	app.py	/^app = Flask(__name__)$/;"	v
+chat	app.py	/^def chat():$/;"	f
+config	app.py	/^def config():$/;"	f
+createToken	app.py	/^def createToken():$/;"	f
+dotenv_path	app.py	/^dotenv_path = join(dirname(__file__), '.env')$/;"	v
+fake	app.py	/^fake = Faker()$/;"	v
+generateToken	app.py	/^def generateToken(identity):$/;"	f
+index	app.py	/^def index():$/;"	f
+notify	app.py	/^def notify():$/;"	f
+provision_sync_default_service	app.py	/^def provision_sync_default_service():$/;"	f
+randomToken	app.py	/^def randomToken():$/;"	f
+register	app.py	/^def register():$/;"	f
+send_notification	app.py	/^def send_notification():$/;"	f
+snake_case_keys	app.py	/^def snake_case_keys(somedict):$/;"	f
+static_file	app.py	/^def static_file(path):$/;"	f
+sync	app.py	/^def sync():$/;"	f
+token	app.py	/^def token(identity):$/;"	f
+video	app.py	/^def video():$/;"	f