Merge branch 'config' of github.com:logxen/Smoothie into config
authorLogxen <logxen@hotmail.com>
Sun, 17 Jun 2012 23:43:43 +0000 (16:43 -0700)
committerLogxen <logxen@hotmail.com>
Sun, 17 Jun 2012 23:43:43 +0000 (16:43 -0700)

Trivial merge