Squashed commit of the following:
Squashed commit of the following:

commit ff4483f3e8ec53417b51e165b93136067f40cd81
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:43:34 2015 +1000

    Add changes from #287

commit 9d99704e3e5e56afbf64735e87c071f23ebd6ed7
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:42:38 2015 +1000

    Add changes from #285

commit 5851beb248501a3ef3b241f35b9f174ce688ea1b
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:29:39 2015 +1000

    Add changes from #252

commit 0d8b83c8fcda23ce761e34ce349264474741349f
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:26:07 2015 +1000

    Add the changes from #237

commit 37d10c356b81b612b29542d9b07bd96ba6acee32
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:24:21 2015 +1000

    Add changes from #273

commit 3b29bfa1d96dea0b89386d09ae577c8a532abd46
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:22:34 2015 +1000

    Adds changes from #233

commit b9cfc67a7f752fecb843f81dc62c32bac31fe912
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:20:37 2015 +1000

    Adds changes from #232

commit d06c82efa990365939ceb1c921528d1e4707738c
Author: Benjamin Hinchley <benjaminhinchley@gmail.com>
Date:   Thu Aug 27 16:18:56 2015 +1000

    Adds changes from #226

benhinchley/Skeleton