add custom post types to rss feed
most recent posts box, bump version to 1.5.15 [deploy:production]
recent posts fix without box
Merge branch 'master' of storm-observatory.beanstalkapp.com:/ttn

Conflicts:
	library/inc/zombie-conf.php
Merge branch 'refs/heads/master' into v2

Conflicts:
	assets/scss/vendor/csswizardry-grids
	assets/scss/vendor/inuit.css
	functions.php