[Swan-commit] Changes to ref refs/heads/master

[Antony Antony]

New commits:
commit 564c14b91004e8e663e90d48253427c629355fd6
Author: Antony Antony <antony at phenome.org>
Date:   Tue May 5 12:34:00 2015 -0500

    testing: clean up conf files and remove nicinit.sh