Merge pull request #1 from exca/develop

Thanks Exca
Merge pull request #2 from exca/develop

Develop
Merge pull request #4 from exca/develop

Exca changes and installer/migration code
Minor margin adjustments
Minor margin adjustments merged
Removed unnecessary @ from logact
Implementing exca's changes
Merge pull request #2 from sjlevy/develop

Pull back Sam's develop' branch changes.