cleaning pu the upcoming meetup page

Author: Faris Chebib

_includes/jumbotron.html

@@ -4,6 +4,6 @@ <h1>Utah Python</h1>
     The Utah Python Meetup Group is a consortium of python meetup groups around Utah.
   </p>
   <p>
-    <a href="#" class="btn btn-lg btn-success">Join Us</a>
+    <a ui-sref="upcoming" class="btn btn-lg btn-success">Join Us</a>
   </p>
 </div>

about.md

@@ -3,4 +3,7 @@ layout: utahpython
 title: "About"
 about-nav: True
 ---
-<h3>About</h3>
+<h3>About</h3>
+
+<p>The most up-to-date place to find out what topics are coming next is
+<a href="{{ page.url-group }}">our mailing list</a>.</p>

index.md

@@ -17,44 +17,7 @@ home-nav: True
 interested in Python technology. Everyone is invited to participate!</p>
 
 <div class="meetings">
-    <h2>Meetings</h2>
 
-    <p>The most up-to-date place to find out what topics are coming next is
-    <a href="{{ page.url-group }}">our mailing list</a>.</p>
-
-    <p>Meetings are held on the second Thursday of each month.<br>
-    6:30 to 8:45 P.M.</p>
-
-    <address>
-        Needle Inc.<br>
-        14864 Pony Express Road<br>
-        Bluffdale, UT 84065
-    </address>
-
-    <p>Just off I-15. <a href="{{ page.url-needle-map }}">(Map.)</a>.
-    Needle is in back, don't go to the C7 side of the buildings.</p>
-
-    <h2>PyLadies!</h2>
-
-    <p>The most up-to-date place to find out what topics are coming next is
-    <a href="{{ page.url-group }}">our mailing list</a>.</p>
-
-    <p>Meetings are held every Tuesday starting at 6:30 P.M.</p>
-
-    <p>Utah Pyladies provides educational and moral support for women who code.
-    Come hang out with women who are learning or have learned to code in
-    Python. Share your coding projects, or find resources for learning. If
-    you've never programmed at all, we'll help you get started. If you have, we
-    want to learn from you!</p>
-
-    <address>
-        HireVue<br>
-        Suite 600<br>
-        10876 S. Riverfront Pkwy<br>
-        South Jordan, UT 84095
-    </address>
-
-    <p>Just off I-15. <a href="{{ page.url-hirevue-map }}">(Map.)</a>.</p>
 </div>
 <div class="archives">
     <h2>Past presentations</h2>

upcoming.md

@@ -2,21 +2,88 @@
 layout: utahpython
 title: "Meetups"
 upcoming-nav: True
+url-needle-map: http://maps.google.com/maps?q=14864+Pony+Express+Dr.+Bluffdale,+UT+84065
+url-group: https://groups.google.com/forum/#!forum/utahpython
+url-hirevue-map: http://maps.google.com/maps?q=10876+S+River+Front+Pkwy+South+Jordan%2C+UT+84095
 ---
 
 ## Meetups
 
-Utah Python currently hosts 3 different meetups around Utah.
+Utah Python a number of different meetups around Utah.
 
-### Salt Lake City & Draper
+### Salt Lake City
+
+Meetings are held on the *first Wednesday* of each month.
+
+Starting times vary between **6:30pm** and **7:30pm**
+
+Locations vary between *Zaniac Sugar House [<span class="glyphicon glyphicon-map-marker"></span>](#)* and *Neutron Interactive [<span class="glyphicon glyphicon-map-marker"></span>](#)*.
 
 <a class="btn btn-success" href="http://www.meetup.com/UtahPython/"
-	target="_blank" 
-	role="button">
-	Join SLC’s Meetup Group
+  target="_blank" 
+  role="button">
+  Join SLC’s Meetup Group
+  <span class="glyphicon glyphicon-new-window"></span>
+</a>
+
+### Draper
+
+Meetings are held on the *second Thursday* of each month:
+**6:30 to 8:45pm**
+
+<address>
+  Needle Inc.<br>
+  14864 Pony Express Road<br>
+  Bluffdale, UT 84065
+</address>
+
+<a class='btn btn-info' href="{{ page.url-needle-map }}">
+  <span class="glyphicon glyphicon-map-marker"></span>
+</a>
+
+<p>
+  Needle is in back, don't go to the C7 side of the buildings.
+</p>
+
+The most up-to-date place to find out what topics are coming next is
+[our mailing list]({{ page.url-group }}).
+
+<a class="btn btn-success" href="http://www.meetup.com/UtahPython/"
+  target="_blank" 
+  role="button">
+  Join Draper’s Meetup Group
   <span class="glyphicon glyphicon-new-window"></span>
 </a>
 
 {% include meetuptmpl.html %}
 
 ### Logan
+
+<a class="btn btn-success" href="http://www.meetup.com/UtahPython/"
+  target="_blank" 
+  role="button">
+  Join Logan’s Meetup Group
+  <span class="glyphicon glyphicon-new-window"></span>
+</a>
+
+### PyLadies
+
+
+Meetings are held *every Tuesday* starting at **6:30pm**
+
+<p>Utah Pyladies provides educational and moral support for women who code.
+Come hang out with women who are learning or have learned to code in
+Python. Share your coding projects, or find resources for learning. If
+you've never programmed at all, we'll help you get started. If you have, we
+want to learn from you!</p>
+
+<address>
+    HireVue<br>
+    Suite 600<br>
+    10876 S. Riverfront Pkwy<br>
+    South Jordan, UT 84095
+</address>
+
+<a class='btn btn-info' href="{{ page.url-hirevue-map }}">
+  <span class="glyphicon glyphicon-map-marker"></span>
+</a>