Merge pull request #10 from michaelryanmcneill/master

Updating to WordPress 3.6
Merge branch 'master' of https://github.com/michaelryanmcneill/wordpress-install
added db type to Boxfile
Merge pull request #1 from pagodabox/master

Updating forked master, before bringing WordPress up to date.