Link to contribution instructions
Merge pull request #1 from castrojo/master

Update for github instructions
Update instructions to 1.2.9 release of charm-tools
Merge pull request #3 from marcoceppi/charm-tools-1.2.9

Update instructions to 1.2.9 release of charm-tools
Update config-manual.html

purged an 'init'
Link to the actual repository
Update howto-node.html
Update config-LXC.html
Update config-LXC.html
Merge pull request #4 from xpat/master

Minor edits, thanks xpat!
some minor fixes, more to come
Merge remote-tracking branch 'upstream/master'

Conflicts:
	htmldocs/contributing.html
Merge pull request #5 from TheMue/master

First changes for minor bugs found during review
Add bundle search URL.
Corrected a casing issue with vagrant init not matching the boxname
Merge pull request #6 from chuckbutler/fix-vagrant-casing

Corrected a casing issue with vagrant init not matching the boxname