Changed the config to match our current setup.

Really, this shouldn't require a commit; see issue #17. Until we fix
that though, This is what we'll have to do.
Updated copyright date.
Merge branch 'devel' into dell-serial