Reconfiguration

Reconfigured my setup to match mikeprimm's.
- Look at latest pull request..