add feed prep
fix merge issues
merge conf
git feeds
Merge branch 'master' of https://github.com/piinthecloud/SeeMore-Aquamarine