Squashed commit of the following:

commit 94255f9b041486f7d102ce2962266c7a430885eb
Author: Jake <jakesergeant@gmail.com>
Date:   Fri Nov 8 11:43:56 2013 +1000

    dev commit3

commit 9b4fa273e46a9546b8b36fefcdcfda3159f985e4
Merge: 2ca4afe 01ede37
Author: Jake <jakesergeant@gmail.com>
Date:   Fri Nov 8 11:40:42 2013 +1000

    Merge remote-tracking branch 'origin/master' into development