Squashed commit of the following:

commit 4efc9f9c1ec6192d07e2b38ae4a1a65fbb540e23
Author: Matth_eu <matthew@matth.eu>
Date:   Tue Aug 27 11:29:13 2013 +0100

    ignore backups

commit d179d75772364ef01b4d4e01b26a5ace85abf91e
Merge: 361a2aa 55c5b09
Author: Matth_eu <matthew@matth.eu>
Date:   Tue Aug 27 11:17:46 2013 +0100

    Merge branch 'master' of github.com:humanmade/hm-base