Merge pull request #3 from anchor/barney-test-cleanup-and-linting

Big cleanup of tests, accommodate pylint
Update setup.py for changed FFI module name
Merge pull request #4 from anchor/fix-build

Update setup.py for changed FFI module name
Bring indentation in line with PEP 8
Mixed indentation = do not want
Merge pull request #5 from anchor/fix-indentation

Bring indentation in line with PEP 8
Merge branch 'master' into barney-stringify-all-source-dicts

Conflicts:
	marquise/marquise.py