lil' formatting
Merge branch 'develop' of github.com:ninjablocks/client into develop