Adding in some different sort options
Fixing dodgy if/else
Merge remote-tracking branch 'steins/master' into feature/more_order_bys

Conflicts:
	README.md
Cleaning up if/elseif/else
Merge pull request #5 from pyro2927/feature/more_order_bys

Adding in some different sort options