Added base_url settings
Fixes url errors
Made a few simple improvements
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	src/routes.php
Merge branch 'refs/heads/base_url'

Conflicts:
	src/config/config.php
	src/routes.php
Merge pull request #7 from JN-Jones/master

Add base_url setting.