Josh's weekend coding spree

https://www.pivotaltracker.com/story/show/63634444
https://www.pivotaltracker.com/story/show/63634612
https://www.pivotaltracker.com/story/show/63635096
https://www.pivotaltracker.com/story/show/63462816
https://www.pivotaltracker.com/story/show/63422230
https://www.pivotaltracker.com/story/show/63636644