Indent fix

These changes fix two cases for me:

1. Some inconsisency with indentation depending on the location of the
   cursor, for example (with | as the cursor position):

   ```html
   {% if sometest %}
      <div>say something</div>
   {% endif %}|
   ```

   With the cursor in that position it will indent as:

   ```html
   {% if sometest %}
     <div>say something</div>
     {% endif %}
   ```

   But with the cursor at the beginning of the line it will indent
   correctly.

2. Using the wrong indentation for certain strangely structured tags.
   Where an couple of elements should look like this:

   ```html
   <input type="text"
          class="some class" />
   <input type="text"
          class="some other class" />
   ```

   Come out looking like:

   ```html
   <input type="text"
          class="some class" />
          <input type="text"
                 class="some other class" />
   ```

Please let me know what you think.