Updated Configuration Files

Configuration now more flexible to port changes, also allows command
line configuration