Revert "Revert "update page_navi calls to bones_page_navi (re:bones update)""

This reverts commit d9574eab46adf94f4e7b8215c3ce137063a73276.
Revert "Revert "more bones update merges""

This reverts commit f7bbf293ec4b5ffe72c3b1d619d433271d98bb1b.
Revert "more bones update merges"

This reverts commit a73d0b7314b22491ca3ec88c358630b8d9b11bd7.
Revert "update page_navi calls to bones_page_navi (re:bones update)"

This reverts commit 38bb30eb458aa3d03e3b3c15364263be7a9e695c.
Revert "update bones backend"

This reverts commit 422523e8236c886af3807114500117ddf56689ce.
Revert "more ds_store files"

This reverts commit efcbc3c4ac5204e4019ee4e94550159fda3fec30.
update modernizr
UGH! DS STORES
last time...ds stores i hope
update scripts.js
fix typo for modernizr include
update login.css and misc. unrelated updates
update header
admin functions
remove $content_width (not sure where it's from)
remove custom title function
add blog name to the title
misc. functions
removed bones plugins
Merge branch 'new-flatstrap-custom' of https://github.com/kaymmm/wordpress-bootstrap into new-flatstrap-custom

Conflicts:
	.DS_Store
	library/.DS_Store