Merge branch 'master' into atom

hyde/layouts/basic/content/blog/angry-post.html

@@ -8,13 +8,13 @@ tags:
     - thoughts
 ---
 
---- mark image
+{% mark image -%}
 
 ![Airport]([[!!images/airport.png]])
 
---- endmark
+{%- endmark %}
 
---- mark excerpt
+{% mark excerpt -%}
 
 To complete the character-study of Mr. Worple, he was a man of extremely
 uncertain temper, and his general tendency was to think that Corky was a poor
@@ -22,7 +22,7 @@ chump and that whatever step he took in any direction on his own account, was
 just another proof of his innate idiocy. I should imagine Jeeves feels very
 much the same about me.
 
---- endmark
+{%- endmark %}
 
 So when Corky trickled into my apartment one afternoon, shooing a girl in
 front of him, and said, "Bertie, I want you to meet my fiancée, Miss Singer,"

hyde/layouts/basic/content/blog/happy-post.html

@@ -8,19 +8,19 @@ tags:
     - thoughts
 ---
 
---- mark image
+{% mark image -%}
 
 ![Airport]([[!!images/airport.png]])
 
---- endmark
+{%- endmark %}
 
---- mark excerpt
+{% mark excerpt -%}
 
 Lady Malvern was a hearty, happy, healthy, overpowering sort of dashed female,
 not so very tall but making up for it by measuring about six feet from the
 O.P. to the Prompt Side.
 
---- endmark
+{%- endmark %}
 
 She fitted into my biggest arm-chair as if it had
 been built round her by someone who knew they were wearing arm-chairs tight

hyde/layouts/basic/content/blog/sad-post.html

@@ -8,13 +8,13 @@ tags:
     - thoughts
 ---
 
---- mark image
+{% mark image -%}
 
 ![A Dark Image]([[!!images/dark.png]])
 
---- endmark
+{%- endmark %}
 
---- mark excerpt
+{% mark excerpt -%}
 
 I went and dressed sadly. It will show you pretty well how pipped I was when I
 tell you that I near as a toucher put on a white tie with a dinner-jacket. I
@@ -22,7 +22,7 @@ sallied out for a bit of food more to pass the time than because I wanted it.
 It seemed brutal to be wading into the bill of fare with poor old Bicky headed
 for the breadline.
 
---- endmark
+{%- endmark %}
 
 When I got back old Chiswick had gone to bed, but Bicky was there, hunched up
 in an arm-chair, brooding pretty tensely, with a cigarette hanging out of the

hyde/server.py

@@ -73,8 +73,6 @@ class HydeRequestHandler(SimpleHTTPRequestHandler):
 
         if not res:
             logger.error("Cannot load file: [%s]" % path)
-            print site.content.resource_deploy_map
-
             return site.config.deploy_root_path.child(path)
         else:
             self.server.generate_resource(res)

hyde/tests/sites/test_tagger/content/blog/angry-post.html

@@ -8,7 +8,7 @@ tags:
     - thoughts
 ---
 
---- mark excerpt
+{% mark excerpt -%}
 
 To complete the character-study of Mr. Worple, he was a man of extremely
 uncertain temper, and his general tendency was to think that Corky was a poor
@@ -16,7 +16,7 @@ chump and that whatever step he took in any direction on his own account, was
 just another proof of his innate idiocy. I should imagine Jeeves feels very
 much the same about me.
 
---- endmark
+{%- endmark %}
 
 So when Corky trickled into my apartment one afternoon, shooing a girl in
 front of him, and said, "Bertie, I want you to meet my fiancée, Miss Singer,"

hyde/tests/sites/test_tagger/content/blog/another-sad-post.html

@@ -8,7 +8,7 @@ tags:
     - events
 ---
 
---- mark excerpt
+{% mark excerpt -%}
 
 I went and dressed sadly. It will show you pretty well how pipped I was when I
 tell you that I near as a toucher put on a white tie with a dinner-jacket. I
@@ -16,7 +16,7 @@ sallied out for a bit of food more to pass the time than because I wanted it.
 It seemed brutal to be wading into the bill of fare with poor old Bicky headed
 for the breadline.
 
---- endmark
+{%- endmark %}
 
 When I got back old Chiswick had gone to bed, but Bicky was there, hunched up
 in an arm-chair, brooding pretty tensely, with a cigarette hanging out of the

hyde/tests/sites/test_tagger/content/blog/happy-post.html

@@ -8,13 +8,13 @@ tags:
     - thoughts
 ---
 
---- mark excerpt
+{% mark excerpt -%}
 
 Lady Malvern was a hearty, happy, healthy, overpowering sort of dashed female,
 not so very tall but making up for it by measuring about six feet from the
 O.P. to the Prompt Side.
 
---- endmark
+{%- endmark %}
 
 She fitted into my biggest arm-chair as if it had
 been built round her by someone who knew they were wearing arm-chairs tight

hyde/tests/sites/test_tagger/content/blog/sad-post.html

@@ -8,13 +8,13 @@ tags:
     - thoughts
 ---
 
---- mark image
+{% mark image -%}
 
 ![A Dark Image]([[!!images/dark.png]])
 
---- endmark
+{%- endmark %}
 
---- mark excerpt
+{% mark excerpt -%}
 
 I went and dressed sadly. It will show you pretty well how pipped I was when I
 tell you that I near as a toucher put on a white tie with a dinner-jacket. I
@@ -22,7 +22,7 @@ sallied out for a bit of food more to pass the time than because I wanted it.
 It seemed brutal to be wading into the bill of fare with poor old Bicky headed
 for the breadline.
 
---- endmark
+{%- endmark %}
 
 When I got back old Chiswick had gone to bed, but Bicky was there, hunched up
 in an arm-chair, brooding pretty tensely, with a cigarette hanging out of the