refresh rake file
Merge branch 'master' into songs
update gems
merge gem updates
merge gem updates
add to get basic tests to pass
Merge branch 'songs'