Reworking configuration files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/LocalPageDao.java
Merge pull request #29 from math1man/master

Restructured
Changes to configuration api.
Merge branch 'master' of https://github.com/shilad/wikapidia
Updated loader to new configuration file library.
Tweaks to support differentiating between local page / category / article return types.
Updates based on Shilad's changes