readme updates
Merge branch 'test_development'

Merge master
Merge branch 'test_development'

Conflicts:
	README.txt
argh
Merge branch 'test_development'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'test_development'

Conflicts:
	bebop.php
	core/bebop-feeds.php
	languages/bebop-en_UK.mo
	languages/bebop-en_UK.po
Merge branch 'test_development'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit

done.
git being silly
git rebase
git rebase
Merge branch 'develop' of github.com:lncd/bebop into develop

Conflicts:
	README.txt
ffs