Some improvements MoonWolf might hate :)

Squashed commit of the following:

commit 40ee5802d42e75e2c3187b33d0f30abc9c557bbc
Author: Anathema <professionalnihilist@gmail.com>
Date:   Thu Feb 7 18:49:18 2013 +0000

    whitespace?

commit ba86d278831c27d8d15cc8c13d8a817a545f34f0
Author: Anathema <professionalnihilist@gmail.com>
Date:   Thu Feb 7 18:48:44 2013 +0000

    stylistic improvements

commit 2fcdf63b29470af395db56747d165621fd0da651
Author: Anathema <professionalnihilist@gmail.com>
Date:   Thu Feb 7 18:47:43 2013 +0000

    bundle improvements