Merge branch 'master' of git.duckland.org:base/www.duckland.org

added sigal into the mix for photos

.gitignore

@@ -9,3 +9,4 @@ __pycache__
 output
 .doit.db
 .doit.db.db
+state_data.json

conf.py

@@ -81,11 +81,14 @@ FEED_LINKS_APPEND_QUERY = False
 DEPLOY_COMMANDS = {
 	'default': [
                 #"nikola check -fl",
+                "cd sigal; sigal build",
                 "nikola build",
                 #"nikola check -f",
 		"chmod -R a+rX output/",
 		"rsync -a --delete -e 'ssh -x -i /home/don/.ssh/http -l duck' output/ wise.dreamhost.com:httpd/duckland.org/nikola",
-                "rsync -a --delete -e 'ssh -x -i /home/don/.ssh/http -l don' ./ don@web.duckland.org:/srv/http/work/www.duckland.org",
+                #"rsync -a --delete -e 'ssh -x -i /home/don/.ssh/http -l don' ./ don@web.duckland.org:/srv/http/work/www.duckland.org",
+                "git add -A",
+                "git commit -m\"auto commit due to nikola deploy $(date)\"",
 		]
 	}
 INDEX_READ_MORE_LINK = '<p class="more"><a href="{link}">{read_more}...a></p>'

posts/2015/07/galveston-summer-2015.rst

@@ -1,7 +1,7 @@
 .. title: Galveston, Summer 2015
 .. slug: galveston-summer-2015
 .. date: 2015-07-19 00:18:22
-.. tags: photos
+.. tags: photo
 .. category: 
 .. link: 
 .. description: 

posts/2016/05/spacecity-comic-con-2016.md

@@ -0,0 +1,16 @@
+<!-- 
+.. title: SpaceCity Comic Con 2016
+.. slug: spacecity-comic-con-2016
+.. date: 2016-05-30 21:11:46 UTC-05:00
+.. tags: personal,photo
+.. category: 
+.. link: 
+.. description: 
+.. type: text
+-->
+
+Many, many, many years ago, I went to a comic/game convention in Austin.  This was pre-internet, and really pre-console gaming, so the games were all table top type.  Steve Jackson Games was prototyping something called 'Car Wars'.  Pretty cool stuff.  
+
+But, I never really had a chance to go back to one.  Until this year.  This past weekend, we went to [SpaceCity Comic Con 2016](http://spacecitycomiccon.com/). It was a hoot.  Learned a few things (pay for the tickets at the door, as the line was way shorter; don't leave the food area with food and expect them to let you back in; silly things like that).
+
+I also took my camera with me to get pics of the kids, and I tried to do some shots of cosplayers.  Not bad for my first attempt.  The results are [here](/photos/Comic-Cons/Space-City-Comic-Con-2016/).