Merge pull request #527 from jonezy/master

production hotfix - march 8, 2014 4:10pm
Merge pull request #528 from jonezy/development

F56 config updates, various other changes.
there was a merge conflict marker that got in here somehow

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge branch 'master' into development
Merge pull request #531 from jonezy/development

few small cleanup things!