Get rid of the anchor tag in image shortcode

templates/shortcodes/image.html

@@ -1,5 +1,4 @@
-<a href="{{url}}">
-	<img class="
+<img class="
 		{% if full %}full{% endif %}
 		{% if pixels %}pixels{% endif %}
 		{% if transparent %}transparent{% endif %}
@@ -7,4 +6,3 @@
 	"
 	{% if alt %}alt="{{alt}}"{% endif %}
 	src="{% if url_min %}{{url_min}}{% else %}{{url}}{% endif %}" />
-</a>

templates/shortcodes/video.html

@@ -1,9 +1,7 @@
-<video
-	class="
+<video class="
 		{% if full %}full{% endif %}
 		{% if pixels %}pixels{% endif %}
 		{% if transparent %}transparent{% endif %}
   	"
 	{% if alt %}alt="{{alt}}"{% endif %}
-	controls src="{{url}}">
-</video>
+	controls src="{{url}}"></video>