Merge commit '1b831d21ac9688e3f31703f0b492202f6d24a75b'

diff --cc packages/aggressive-indent/README.md
Simple merge

diff --cc packages/aggressive-indent/aggressive-indent.el
index a4424cbbedcc283814ab42f1fbb5c15f546077ac,187b76dd49fd56931b141d2356538dc5fdda86e9..67c3af8571009ef5c2955222627db959cf6c2306
--- 1/packages/aggressive-indent/aggressive-indent.el
--- 2/aggressive-indent.el
+++ b/packages/aggressive-indent/aggressive-indent.el
@@@ -1,10 -1,10 +1,10 @@@
 -;;; aggressive-indent.el --- Minor mode to aggressively keep your code always indented
 +;;; aggressive-indent.el --- Minor mode to aggressively keep your code always indented  -*- lexical-binding:t -*-
  
 -;; Copyright (C) 2014 Free Software Foundation, Inc.
 +;; Copyright (C) 2014, 2015 Free Software Foundation, Inc
  
  ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
- ;; URL: http://github.com/Malabarba/aggressive-indent-mode
- ;; Version: 1.4
+ ;; URL: https://github.com/Malabarba/aggressive-indent-mode
+ ;; Version: 1.5
  ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
  ;; Keywords: indent lisp maint tools
  ;; Prefix: aggressive-indent